Proposal for Issue #31 - Richer Username Token Policies

["Hal Lockhart" <hlockhar@bea.com>]

I propose that lines 836-857 be replaced with:

----
/sp:UsernameTokenAlone
This identifies a UsernameToken assertion with no password or hash
value.
/sp:UsernameToken/@sp:IncludeToken
This optional attribute identifies the token inclusion value for this
token assertion.
/sp:UsernameToken/wsp:Policy
This optional element identifies additional requirements for use of the
sp:UsernameToken assertion.
/sp:UsernameToken/wsp:Policy/sp:RequireDerivedKeys
This optional element sets the [Derived Keys], [Explicit Derived Keys]
and [Implicit Derived Keys]  properties for this token to 'true'.
/sp:UsernameToken/wsp:Policy/sp:RequireExplicitDerivedKeys
This optional element sets the [Derived Keys] and [Explicit Derived
Keys] properties for this token to 'true' and the [Implicit Derived
Keys] property for this token to 'false'.
/sp:UsernameToken/wsp:Policy/sp:RequireImplicitDerivedKeys
This optional element sets the [Derived Keys] and [Implicit Derived
Keys] properties for this token to 'true' and the [Explicit Derived
Keys] property for this token to 'false'.
/sp:UsernameToken/wsp:Policy/sp:WssUsernameToken10
This optional element indicates that a Username token should be used as
defined in [WSS: Username Token Profile 1.0]. As noted above, this is
the default version of this token.
/sp:UsernameToken/wsp:Policy/sp:WssUsernameToken11
This optional element indicates that a Username token should be used as
defined in [WSS: Username Token Profile 1.1].


/sp:UsernameTokenPassword
This identifies a UsernameToken assertion with a text password.
/sp:UsernameToken/@sp:IncludeToken
This optional attribute identifies the token inclusion value for this
token assertion.
/sp:UsernameToken/wsp:Policy
This optional element identifies additional requirements for use of the
sp:UsernameToken assertion.
/sp:UsernameToken/wsp:Policy/sp:WssUsernameToken10
This optional element indicates that a Username token should be used as
defined in [WSS: Username Token Profile 1.0]. As noted above, this is
the default version of this token.
/sp:UsernameToken/wsp:Policy/sp:WssUsernameToken11
This optional element indicates that a Username token should be used as
defined in [WSS: Username Token Profile 1.1].


/sp:UsernameTokenHash
This identifies a UsernameToken assertion with a hash value.
/sp:UsernameToken/@sp:IncludeToken
This optional attribute identifies the token inclusion value for this
token assertion.
/sp:UsernameToken/wsp:Policy
This optional element identifies additional requirements for use of the
sp:UsernameToken assertion.
/sp:UsernameToken/wsp:Policy/sp:WssUsernameToken10
This optional element indicates that a Username token should be used as
defined in [WSS: Username Token Profile 1.0]. As noted above, this is
the default version of this token.
/sp:UsernameToken/wsp:Policy/sp:WssUsernameToken11
This optional element indicates that a Username token should be used as
defined in [WSS: Username Token Profile 1.1].
----

Also some editorial changes will be required to the introductory text at
the start of section 5.3.1 and the Syntax block.

Hal