[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openam-commit
Subject: [CommitOpenAM] [10808] branches/AME-4569-XACML-Response-Provider-Support: Merging from trunk:
From: noreply () forgerock ! org
Date: 2014-09-30 11:44:09
Message-ID: 20140930114409.1FA7140934 () sources ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[10808] branches/AME-4569-XACML-Response-Provider-Support: Merging from trunk: \
10794</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/openam/?cs=10808">10808</a></dd> \
<dt>Author</dt> <dd>tony.bamford</dd> <dt>Date</dt> <dd>2014-09-30 12:44:08 +0100 \
(Tue, 30 Sep 2014)</dd> </dl>
<h3>Log Message</h3>
<pre>Merging from trunk: 10794</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamclientsdkpomxml"> \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-clientsdk/pom.xml</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentityidmAMIdentityjava">branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/idm/AMIdentity.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsAMIdentityMembershipConditionjava">branches/AME-4569-XACML-R \
esponse-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentityMembershipCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsAuthLevelConditionjava">branches/AME-4569-XACML-Response-Pro \
vider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthLevelCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsAuthSchemeConditionjava">branches/AME-4569-XACML-Response-Pr \
ovider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthSchemeCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsAuthenticateToRealmConditionjava">branches/AME-4569-XACML-Re \
sponse-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToRealmCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsAuthenticateToServiceConditionjava">branches/AME-4569-XACML- \
Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToServiceCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsIPConditionjava">branches/AME-4569-XACML-Response-Provider-S \
upport/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/IPCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsLDAPFilterConditionjava">branches/AME-4569-XACML-Response-Pr \
ovider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPFilterCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsLEAuthLevelConditionjava">branches/AME-4569-XACML-Response-P \
rovider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/LEAuthLevelCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsResourceEnvIPConditionjava">branches/AME-4569-XACML-Response \
-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/ResourceEnvIPCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsSessionConditionjava">branches/AME-4569-XACML-Response-Provi \
der-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsSessionPropertyConditionjava">branches/AME-4569-XACML-Respon \
se-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionPropertyCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavac \
omsunidentitypolicypluginsSimpleTimeConditionjava">branches/AME-4569-XACML-Response-Pr \
ovider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SimpleTimeCondition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavao \
rgforgerockopenamnetworkipv4IPv4Conditionjava">branches/AME-4569-XACML-Response-Provid \
er-Support/openam/openam-core/src/main/java/org/forgerock/openam/network/ipv4/IPv4Condition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavao \
rgforgerockopenamnetworkipv6IPv6Conditionjava">branches/AME-4569-XACML-Response-Provid \
er-Support/openam/openam-core/src/main/java/org/forgerock/openam/network/ipv6/IPv6Condition.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavao \
rgforgerockopenamupgradestepspolicyconditionsPolicyConditionUpgradeMapjava">branches/A \
ME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/upgrade/steps/policy/conditions/PolicyConditionUpgradeMap.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainresou \
rcesEntitlementExceptionproperties">branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/resources/EntitlementException.properties</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamentitlementssrcm \
ainjavacomsunidentityentitlementEntitlementExceptionjava">branches/AME-4569-XACML-Resp \
onse-Provider-Support/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/EntitlementException.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamentitlementssrcm \
ainjavaorgforgerockopenamentitlementEntitlementRegistryjava">branches/AME-4569-XACML-R \
esponse-Provider-Support/openam/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/EntitlementRegistry.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamrestsrctestjavao \
rgforgerockopenamforgerockrestentitlementsJsonPolicyParserTestjava">branches/AME-4569- \
XACML-Response-Provider-Support/openam/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/entitlements/JsonPolicyParserTest.java</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/entitlement/conditions/</li>
<li>branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/test/java/org/forgerock/openam/entitlement/conditions/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/entitlement/conditions/</li>
<li>branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/test/java/org/forgerock/openam/entitlement/conditions/</li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchesAME4569XACMLResponseProviderSupport">branches/AME-4569-XACML-Response-Provider-Support/</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportcommunityextensionscrowdprov \
ider">branches/AME-4569-XACML-Response-Provider-Support/community/extensions/crowdprovider/</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenam">branches/AME-4569-XACML-Response-Provider-Support/openam/</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamdocumentationope \
namdocsource">branches/AME-4569-XACML-Response-Provider-Support/openam/openam-documentation/openam-doc-source/</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamoauth2">branches/AME-4569-XACML-Response-Provider-Support/openam/openam-oauth2/</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamopenamrestsrcmainjavao \
rgforgerockopenamforgerockrestIdentityResourceV1java">branches/AME-4569-XACML-Response \
-Provider-Support/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResourceV1.java</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenamagents">branches/AME-4569-XACML-Response-Provider-Support/openam-agents/</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopensso">branches/AME-4569-XACML-Response-Provider-Support/opensso/</a></li>
<li><a href="#branchesAME4569XACMLResponseProviderSupportopenssoproducts">branches/AME-4569-XACML-Response-Provider-Support/opensso/products/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesAME4569XACMLResponseProviderSupport"></a>
<div class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support</h4> <pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-2526-SFO-between-sites:7510-8258
</span><span class="cx">/branches/AME-3423:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington:9534-9723
</span><span class="cx">/branches/AME-3719:9517-9879
</span><span class="cx">/branches/AME-4378:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459:10437-10535
</span><span class="cx">/branches/AME-4547:10585-10783
</span><span class="cx">/branches/IIS7PostData:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation:7834-7844
</span><span class="cx">/branches/ame4103:9979,9981,9998,10000,10002,10007-10008,10016,10018,10038
</span><span class="cx">/branches/ame4272:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2:7508-7697
</span><span class="cx">/branches/andy-ame1316-connectionfactory:5311-5328
</span><span class="cx">/branches/andy-cts-connection-pool:7098-7175
</span><span class="cx">/branches/andy-openam-2654:6872-6911
</span><span class="cx">/branches/andy-openam-2880:6451-6503
</span><span class="cx">/branches/andy-openam-2907:6531-6534
</span><span class="cx">/branches/andy-openam-3006:6709-6749
</span><span class="cx">/branches/andy-openam-3063:6927-6948
</span><span class="cx">/branches/andy-openam-3193:7124-7128
</span><span class="cx">/branches/andy-openam-3248:7171-7715
</span><span class="cx">/branches/andy-openam2743:6372-6439
</span><span class="cx">/branches/andy-openam2744:6347-6367
</span><span class="cx">/branches/andyAme2972:8270-8318
</span><span class="cx">/branches/andyAme3196:8853-9084
</span><span class="cx">/branches/andyOpenam1708:5576-5592
</span><span class="cx">/branches/andyOpenam2140:7819-7862
</span><span class="cx">/branches/andyOpenam2373:5600-5706
</span><span class="cx">/branches/andyOpenam2525:5601-5733
</span><span class="cx">/branches/andyOpenam3509:7881-7963
</span><span class="cx">/branches/andyOpenam3638:8094-8172
</span><span class="cx">/branches/andyPolicyCrest:8295-8813
</span><span class="cx">/branches/apforrest-ame1316:4881-5305
</span><span class="cx">/branches/maven_merge:2556-3124
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug:6767-6804
</span><span class="cx">/branches/openam2742-andy:6266-6323
</span><span class="cx">/branches/pcunnington-AME-3115-refactor:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158:8476-8577
</span><span class="cx">/branches/pcunnington-AME-350:4165-4344
</span><span class="cx">/branches/pcunnington-ame-344:4651-5199
</span><span class="cx">/branches/pcunnington-oauth2:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114:8314-8341
</span><span class="cx">/branches/policyimprovements:5513-5515
</span><span class="cx">/branches/rwapshott-AME-1739:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars:6170-6194
</span><span class="cx">/trunk:10625,10631,10633,10638,10640,10643,10648,10657,10661,1 \
0664,10667-10668,10670,10672,10674-10677,10686-10687,10694-10696,10701,10713,10716,10719,10721,10723,10725,10728,10735,10747,10751,10761-10762,10777,10780,10784
</span><span class="cx"> + /branches/10.1.0-Xpress:3888-3892
</span><span class="cx">/branches/AME-2526-SFO-between-sites:7510-8258
</span><span class="cx">/branches/AME-3423:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington:9534-9723
</span><span class="cx">/branches/AME-3719:9517-9879
</span><span class="cx">/branches/AME-4378:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459:10437-10535
</span><span class="cx">/branches/AME-4547:10585-10783
</span><span class="cx">/branches/AME-4595:10581-10789
</span><span class="cx">/branches/IIS7PostData:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation:7834-7844
</span><span class="cx">/branches/ame4103:9979,9981,9998,10000,10002,10007-10008,10016,10018,10038
</span><span class="cx">/branches/ame4272:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2:7508-7697
</span><span class="cx">/branches/andy-ame1316-connectionfactory:5311-5328
</span><span class="cx">/branches/andy-cts-connection-pool:7098-7175
</span><span class="cx">/branches/andy-openam-2654:6872-6911
</span><span class="cx">/branches/andy-openam-2880:6451-6503
</span><span class="cx">/branches/andy-openam-2907:6531-6534
</span><span class="cx">/branches/andy-openam-3006:6709-6749
</span><span class="cx">/branches/andy-openam-3063:6927-6948
</span><span class="cx">/branches/andy-openam-3193:7124-7128
</span><span class="cx">/branches/andy-openam-3248:7171-7715
</span><span class="cx">/branches/andy-openam2743:6372-6439
</span><span class="cx">/branches/andy-openam2744:6347-6367
</span><span class="cx">/branches/andyAme2972:8270-8318
</span><span class="cx">/branches/andyAme3196:8853-9084
</span><span class="cx">/branches/andyOpenam1708:5576-5592
</span><span class="cx">/branches/andyOpenam2140:7819-7862
</span><span class="cx">/branches/andyOpenam2373:5600-5706
</span><span class="cx">/branches/andyOpenam2525:5601-5733
</span><span class="cx">/branches/andyOpenam3509:7881-7963
</span><span class="cx">/branches/andyOpenam3638:8094-8172
</span><span class="cx">/branches/andyPolicyCrest:8295-8813
</span><span class="cx">/branches/apforrest-ame1316:4881-5305
</span><span class="cx">/branches/maven_merge:2556-3124
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug:6767-6804
</span><span class="cx">/branches/openam2742-andy:6266-6323
</span><span class="cx">/branches/pcunnington-AME-3115-refactor:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158:8476-8577
</span><span class="cx">/branches/pcunnington-AME-350:4165-4344
</span><span class="cx">/branches/pcunnington-ame-344:4651-5199
</span><span class="cx">/branches/pcunnington-oauth2:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114:8314-8341
</span><span class="cx">/branches/policyimprovements:5513-5515
</span><span class="cx">/branches/rwapshott-AME-1739:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars:6170-6194
</span><span class="cx">/trunk:10625,10631,10633,10638,10640,10643,10648,10657,10661,1 \
0664,10667-10668,10670,10672,10674-10677,10686-10687,10694-10696,10701,10713,10716,10719,10721,10723,10725,10728,10735,10747,10751,10761-10762,10777,10780,10784,10794
</span><a id="branchesAME4569XACMLResponseProviderSupportcommunityextensionscrowdprovider"></a>
<div class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support/community/extensions/crowdprovider</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-3423/community/extensions/crowdprovider:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/community/extensions/crowdprovider:9534-9723
</span><span class="cx">/branches/AME-3719/community/extensions/crowdprovider:9517-9879
</span><span class="cx">/branches/AME-4378/community/extensions/crowdprovider:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/community/extensions/crowdprovider:10437-10535
</span><span class="cx">/branches/AME-4547/community/extensions/crowdprovider:10585-10783
</span><span class="cx">/branches/IIS7PostData/opensso/extensions/seraphprovider:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/community/extensions/crowdprovider:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/community/extensions/crowdprovider:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/community/extensions/crowdprovider:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/community/extensions/crowdprovider:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/community/extensions/crowdprovider:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/community/extensions/crowdprovider:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/community/extensions/crowdprovider:7834-7844
</span><span class="cx">/branches/allanCSDK/extensions/seraphprovider:64-163
</span><span class="cx">/branches/ame4272/community/extensions/crowdprovider:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/community/extensions/crowdprovider:7508-7697
</span><span class="cx">/branches/maven_merge/community/extensions/crowdprovider:2556-2561
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/community/extensions/crowdprovider:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/community/extensions/crowdprovider:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/community/extensions/crowdprovider:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/community/extensions/crowdprovider:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/community/extensions/crowdprovider:6767-6804
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/community/extensions/crowdprovider:8348-8473
</span><span class="cx">/branches/pcunnington-oauth2/community/extensions/crowdprovider:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/community/extensions/crowdprovider:8314-8341
</span><span class="cx">/branches/rwapshott-AME-1739/community/extensions/crowdprovider:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/community/extensions/crowdprovider:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/community/extensions/crowdprovider:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/community/extensions/crowdprovider:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/community/extensions/crowdprovider:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/community/extensions/crowdprovider:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/community/extensions/crowdprovider:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/community/extensions/crowdprovider:6170-6194
</span><span class="cx">/trunk/community/extensions/crowdprovider:2556-2930,10625,10631,10633,10638,10640,10643,10648,10784
</span><span class="cx"> + \
/branches/AME-2526-SFO-between-sites/community/extensions/crowdprovider:7510-8258 \
</span><span class="cx">/branches/AME-3423/community/extensions/crowdprovider:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/community/extensions/crowdprovider:9534-9723
</span><span class="cx">/branches/AME-3719/community/extensions/crowdprovider:9517-9879
</span><span class="cx">/branches/AME-4378/community/extensions/crowdprovider:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/community/extensions/crowdprovider:10437-10535
</span><span class="cx">/branches/AME-4547/community/extensions/crowdprovider:10585-10783
</span><span class="cx">/branches/AME-4595/community/extensions/crowdprovider:10581-10789
</span><span class="cx">/branches/IIS7PostData/opensso/extensions/seraphprovider:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/community/extensions/crowdprovider:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/community/extensions/crowdprovider:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/community/extensions/crowdprovider:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/community/extensions/crowdprovider:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/community/extensions/crowdprovider:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/community/extensions/crowdprovider:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/community/extensions/crowdprovider:7834-7844
</span><span class="cx">/branches/allanCSDK/extensions/seraphprovider:64-163
</span><span class="cx">/branches/ame4272/community/extensions/crowdprovider:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/community/extensions/crowdprovider:7508-7697
</span><span class="cx">/branches/maven_merge/community/extensions/crowdprovider:2556-2561
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/community/extensions/crowdprovider:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/community/extensions/crowdprovider:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/community/extensions/crowdprovider:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/community/extensions/crowdprovider:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/community/extensions/crowdprovider:6767-6804
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/community/extensions/crowdprovider:8348-8473
</span><span class="cx">/branches/pcunnington-oauth2/community/extensions/crowdprovider:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/community/extensions/crowdprovider:8314-8341
</span><span class="cx">/branches/rwapshott-AME-1739/community/extensions/crowdprovider:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/community/extensions/crowdprovider:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/community/extensions/crowdprovider:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/community/extensions/crowdprovider:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/community/extensions/crowdprovider:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/community/extensions/crowdprovider:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/community/extensions/crowdprovider:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/community/extensions/crowdprovider:6170-6194
</span><span class="cx">/trunk/community/extensions/crowdprovider:2556-2930,10625,10631,10633,10638,10640,10643,10648,10784,10794
</span><a id="branchesAME4569XACMLResponseProviderSupportopenam"></a>
<div class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support/openam</h4> <pre \
class="diff"><span> </span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-2629/openam:7585-7632
</span><span class="cx">/branches/AME-2766-policy-entitlements-REST-APIs/openam:8455-8476
</span><span class="cx">/branches/AME-3087-entitlements-CREST-management/openam:8481-8664
</span><span class="cx">/branches/AME-3087_query_and_patch/openam:8667-8681
</span><span class="cx">/branches/AME-3405-session-read-from-cts/openam:8749-8823
</span><span class="cx">/branches/AME-3423/openam:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/openam:9534-9723
</span><span class="cx">/branches/AME-3719/openam:9517-9879
</span><span class="cx">/branches/AME-3726-script-sandboxing/openam:9663-9819
</span><span class="cx">/branches/AME-4378/openam:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam:10437-10535
</span><span class="cx">/branches/AME-4547/openam:10585-10783
</span><span class="cx">/branches/CTS-Async/openam:8847-9739
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/openam:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/openam:6910-6946
</span><span class="cx">/branches/OPENAM-3130-session-quota/openam:6958-6972
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/openam:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/openam:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/openam:8747-8835
</span><span class="cx">/branches/OPENAM-4028-connection-pool/openam:9750-10171
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/openam:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/openam:7834-7844
</span><span class="cx">/branches/ame4272/openam:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/openam:7508-7697
</span><span class="cx">/branches/andy-ame1316-connectionfactory/openam:5311-5328
</span><span class="cx">/branches/andy-cts-connection-pool/openam:7098-7175
</span><span class="cx">/branches/andy-openam-2654/openam:6872-6911
</span><span class="cx">/branches/andy-openam-2880/openam:6451-6503
</span><span class="cx">/branches/andy-openam-2907/openam:6531-6534
</span><span class="cx">/branches/andy-openam-3006/openam:6709-6749
</span><span class="cx">/branches/andy-openam-3063/openam:6927-6948
</span><span class="cx">/branches/andy-openam-3193/openam:7124-7128
</span><span class="cx">/branches/andy-openam-3248/openam:7171-7715
</span><span class="cx">/branches/andy-openam2743/openam:6372-6439
</span><span class="cx">/branches/andy-openam2744/openam:6347-6367
</span><span class="cx">/branches/andyAme2972/openam:8270-8318
</span><span class="cx">/branches/andyAme3102/openam:8312-8413
</span><span class="cx">/branches/andyAme3196/openam:8853-9084
</span><span class="cx">/branches/andyOpenam1708/openam:5576-5592
</span><span class="cx">/branches/andyOpenam2140/openam:7819-7862
</span><span class="cx">/branches/andyOpenam2373/openam:5600-5706
</span><span class="cx">/branches/andyOpenam2525/openam:5601-5733
</span><span class="cx">/branches/andyOpenam3509/openam:7881-7963
</span><span class="cx">/branches/andyOpenam3638/openam:8094-8172
</span><span class="cx">/branches/andyPolicyCrest/openam:8295-8813
</span><span class="cx">/branches/apforrest-ame1316/openam:4881-5305
</span><span class="cx">/branches/apforrest_ame805_indextree/openam:4567-4852
</span><span class="cx">/branches/dirk_oauth_perf:5904
</span><span class="cx">/branches/dirk_sts:5297,5314,5317-5318,5320-5321
</span><span class="cx">/branches/oidc_authn:8507,8540,8557-8559,8565-8566
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/openam:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/openam:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/openam:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/openam:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/openam:6767-6804
</span><span class="cx">/branches/openam2742-andy/openam:6266-6323
</span><span class="cx">/branches/openam_10.1.0_xacml3_JAS/openam:4039-4140
</span><span class="cx">/branches/openam_10.2.0_xacml3_JAS/openam:4141-4379
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/openam:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/openam:8476-8577
</span><span class="cx">/branches/pcunnington-AME-350/openam:4165-4344
</span><span class="cx">/branches/pcunnington-ame-344/openam:4651-5199
</span><span class="cx">/branches/pcunnington-oauth2/openam:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/openam:8314-8341
</span><span class="cx">/branches/policyimprovements/openam:5513-5515
</span><span class="cx">/branches/rest_sts_publish:8167,8180,8214,8227,8245,8260
</span><span class="cx">/branches/rest_sts_view_bean:9690-9965
</span><span class="cx">/branches/rwapshott-AME-1739/openam:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/openam:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/openam:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/openam:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2027-cts-oids-should-follow-fr-oid-scheme/openam:5609-5614
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/openam:6086-6319
</span><span class="cx">/branches/rwapshott-ame-2311-index-names/openam:6058-6069
</span><span class="cx">/branches/rwapshott-ame-258-cts-replication/openam:5548-6055
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/openam:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/openam:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/openam:6170-6194
</span><span class="cx">/branches/rwapshott-openam-2729-saml2-error/openam:6247-6257
</span><span class="cx">/branches/sts_oidc_saml:8310,8352,8355,8368,8378-8379,8387-8388,8403,8410,8416
</span><span class="cx">/branches/sts_oidc_saml_redux:8417-8422,8424,8440,8445-8446,8460,8490,8498
</span><span class="cx">/branches/sts_restart_persistence:9003-9005,9009-9414
</span><span class="cx">/branches/sts_saml2_encrypt:10424-10472,10474-10550
</span><span class="cx">/branches/sts_service_listeners:9968-10031,10047-10048,10053
</span><span class="cx">/branches/sts_token_gen_service:8706,8717-8720,8723-8725,8727-8728,8731,8737,8740-8742,8759-8760,8774-8776,8796-8797,8800-8801,8818-8819,8821
</span><span class="cx">/branches/sts_token_gen_service2:8844-8887,8894-9000
</span><span class="cx">/branches/sts_x509:10206-10398
</span><span class="cx">/trunk/openam:10625,10631,10633,10638,10640,10643,10648,10657, \
10661,10664,10667-10668,10670,10672,10674,10676-10677,10686,10694-10696,10701,10713,10 \
716,10719,10721,10723,10725,10728,10735,10747,10751,10761-10762,10777,10780,10784 \
</span><span class="cx"> + /branches/AME-2526-SFO-between-sites/openam:7510-8258 \
</span><span class="cx">/branches/AME-2629/openam:7585-7632 </span><span \
class="cx">/branches/AME-2766-policy-entitlements-REST-APIs/openam:8455-8476 \
</span><span class="cx">/branches/AME-3087-entitlements-CREST-management/openam:8481-8664
</span><span class="cx">/branches/AME-3087_query_and_patch/openam:8667-8681
</span><span class="cx">/branches/AME-3405-session-read-from-cts/openam:8749-8823
</span><span class="cx">/branches/AME-3423/openam:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/openam:9534-9723
</span><span class="cx">/branches/AME-3719/openam:9517-9879
</span><span class="cx">/branches/AME-3726-script-sandboxing/openam:9663-9819
</span><span class="cx">/branches/AME-4378/openam:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam:10437-10535
</span><span class="cx">/branches/AME-4547/openam:10585-10783
</span><span class="cx">/branches/AME-4595/openam:10581-10789
</span><span class="cx">/branches/CTS-Async/openam:8847-9739
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/openam:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/openam:6910-6946
</span><span class="cx">/branches/OPENAM-3130-session-quota/openam:6958-6972
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/openam:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/openam:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/openam:8747-8835
</span><span class="cx">/branches/OPENAM-4028-connection-pool/openam:9750-10171
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/openam:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/openam:7834-7844
</span><span class="cx">/branches/ame4272/openam:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/openam:7508-7697
</span><span class="cx">/branches/andy-ame1316-connectionfactory/openam:5311-5328
</span><span class="cx">/branches/andy-cts-connection-pool/openam:7098-7175
</span><span class="cx">/branches/andy-openam-2654/openam:6872-6911
</span><span class="cx">/branches/andy-openam-2880/openam:6451-6503
</span><span class="cx">/branches/andy-openam-2907/openam:6531-6534
</span><span class="cx">/branches/andy-openam-3006/openam:6709-6749
</span><span class="cx">/branches/andy-openam-3063/openam:6927-6948
</span><span class="cx">/branches/andy-openam-3193/openam:7124-7128
</span><span class="cx">/branches/andy-openam-3248/openam:7171-7715
</span><span class="cx">/branches/andy-openam2743/openam:6372-6439
</span><span class="cx">/branches/andy-openam2744/openam:6347-6367
</span><span class="cx">/branches/andyAme2972/openam:8270-8318
</span><span class="cx">/branches/andyAme3102/openam:8312-8413
</span><span class="cx">/branches/andyAme3196/openam:8853-9084
</span><span class="cx">/branches/andyOpenam1708/openam:5576-5592
</span><span class="cx">/branches/andyOpenam2140/openam:7819-7862
</span><span class="cx">/branches/andyOpenam2373/openam:5600-5706
</span><span class="cx">/branches/andyOpenam2525/openam:5601-5733
</span><span class="cx">/branches/andyOpenam3509/openam:7881-7963
</span><span class="cx">/branches/andyOpenam3638/openam:8094-8172
</span><span class="cx">/branches/andyPolicyCrest/openam:8295-8813
</span><span class="cx">/branches/apforrest-ame1316/openam:4881-5305
</span><span class="cx">/branches/apforrest_ame805_indextree/openam:4567-4852
</span><span class="cx">/branches/dirk_oauth_perf:5904
</span><span class="cx">/branches/dirk_sts:5297,5314,5317-5318,5320-5321
</span><span class="cx">/branches/oidc_authn:8507,8540,8557-8559,8565-8566
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/openam:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/openam:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/openam:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/openam:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/openam:6767-6804
</span><span class="cx">/branches/openam2742-andy/openam:6266-6323
</span><span class="cx">/branches/openam_10.1.0_xacml3_JAS/openam:4039-4140
</span><span class="cx">/branches/openam_10.2.0_xacml3_JAS/openam:4141-4379
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/openam:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/openam:8476-8577
</span><span class="cx">/branches/pcunnington-AME-350/openam:4165-4344
</span><span class="cx">/branches/pcunnington-ame-344/openam:4651-5199
</span><span class="cx">/branches/pcunnington-oauth2/openam:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/openam:8314-8341
</span><span class="cx">/branches/policyimprovements/openam:5513-5515
</span><span class="cx">/branches/rest_sts_publish:8167,8180,8214,8227,8245,8260
</span><span class="cx">/branches/rest_sts_view_bean:9690-9965
</span><span class="cx">/branches/rwapshott-AME-1739/openam:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/openam:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/openam:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/openam:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2027-cts-oids-should-follow-fr-oid-scheme/openam:5609-5614
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/openam:6086-6319
</span><span class="cx">/branches/rwapshott-ame-2311-index-names/openam:6058-6069
</span><span class="cx">/branches/rwapshott-ame-258-cts-replication/openam:5548-6055
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/openam:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/openam:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/openam:6170-6194
</span><span class="cx">/branches/rwapshott-openam-2729-saml2-error/openam:6247-6257
</span><span class="cx">/branches/sts_oidc_saml:8310,8352,8355,8368,8378-8379,8387-8388,8403,8410,8416
</span><span class="cx">/branches/sts_oidc_saml_redux:8417-8422,8424,8440,8445-8446,8460,8490,8498
</span><span class="cx">/branches/sts_restart_persistence:9003-9005,9009-9414
</span><span class="cx">/branches/sts_saml2_encrypt:10424-10472,10474-10550
</span><span class="cx">/branches/sts_service_listeners:9968-10031,10047-10048,10053
</span><span class="cx">/branches/sts_token_gen_service:8706,8717-8720,8723-8725,8727-8728,8731,8737,8740-8742,8759-8760,8774-8776,8796-8797,8800-8801,8818-8819,8821
</span><span class="cx">/branches/sts_token_gen_service2:8844-8887,8894-9000
</span><span class="cx">/branches/sts_x509:10206-10398
</span><span class="cx">/trunk/openam:10625,10631,10633,10638,10640,10643,10648,10657, \
10661,10664,10667-10668,10670,10672,10674,10676-10677,10686,10694-10696,10701,10713,10 \
716,10719,10721,10723,10725,10728,10735,10747,10751,10761-10762,10777,10780,10784,10794
</span><a id="branchesAME4569XACMLResponseProviderSupportopenamopenamclientsdkpomxml"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-clientsdk/pom.xml \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-clientsdk/pom.xml 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-clientsdk/pom.xml 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -251,10 +251,12 @@
</span><span class="cx"> \
<include>org/forgerock/openam/entitlement/indextree/TreeSaveIndex*</include>
</span><span class="cx"> \
<include>org/forgerock/openam/entitlement/indextree/TreeSearchIndex*</include>
</span><span class="cx"> \
<include>org/forgerock/openam/entitlement/utils/EntitlementUtils*</include>
</span><ins>+ \
<include>org/forgerock/openam/entitlement/conditions/**</include> \
</ins><span class="cx"> \
<include>org/forgerock/openam/services/cdm/**</include> </span><span \
class="cx"> \
<include>org/forgerock/openam/security/whitelist/**</include> \
</span><span class="cx"> \
<include>org/forgerock/openam/upgrade/UpgradeException*</include> \
</span><span class="cx"> \
<include>org/forgerock/openam/validation/ResponseValidationFilter*</include>
</span><ins>+ \
<include>META-INF/services/org.forgerock.openam.entitlement.ConditionTypeRegistry</include>
</ins><span class="cx"> </includes>
</span><span class="cx"> <excludes>
</span><span class="cx"> \
<exclude>com/iplanet/am/sdk/ldap/**</exclude> </span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentityidmAMIdentityjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/idm/AMIdentity.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/idm/AMIdentity.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/idm/AMIdentity.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> * @supported.api
</span><span class="cx"> */
</span><span class="cx">
</span><del>-public final class AMIdentity {
</del><ins>+public class AMIdentity {
</ins><span class="cx">
</span><span class="cx"> private String univIdWithoutDN;
</span><span class="cx">
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsAMIdentityMembershipConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentityMembershipCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentityMembershipCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AMIdentityMembershipCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,10 +25,10 @@
</span><span class="cx"> * $Id: AMIdentityMembershipCondition.java,v 1.2 2008/06/25 \
05:43:50 qcheng Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> /*
</span><del>- * Portions Copyrighted [2011] [ForgeRock AS]
</del><ins>+ * Portions Copyrighted 2011-2014 ForgeRock AS
</ins><span class="cx"> */
</span><ins>+
</ins><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="cx"> import java.util.*;
</span><span class="lines">@@ -59,7 +59,10 @@
</span><span class="cx"> * in the environment is a member of at least one \
<code>AMIdentity</code> </span><span class="cx"> * object specified in \
the Condition. </span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.AMIdentityMembershipCondition}
+ * instead.
</ins><span class="cx"> */
</span><ins>+@Deprecated
</ins><span class="cx"> public class AMIdentityMembershipCondition implements \
Condition { </span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsAuthLevelConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthLevelCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthLevelCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthLevelCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,9 +25,11 @@
</span><span class="cx"> * $Id: AuthLevelCondition.java,v 1.9 2009/05/26 08:06:23 \
kiran_gonipati Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><ins>+/*
+ * Portions Copyright 2014 ForgeRock AS
+ */
</ins><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.authentication.util.AMAuthUtils;
</span><span class="lines">@@ -61,7 +63,9 @@
</span><span class="cx"> * <code>env</code> map, \
<code>AuthLevel</code> is looked up from single sign on </span><span \
class="cx"> * token. </span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.AuthLevelCondition} instead. \
</ins><span class="cx"> */ </span><ins>+@Deprecated
</ins><span class="cx"> public class AuthLevelCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> private static final Debug DEBUG
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsAuthSchemeConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthSchemeCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthSchemeCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthSchemeCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,10 +25,12 @@
</span><span class="cx"> * $Id: AuthSchemeCondition.java,v 1.6 2009/05/05 18:29:01 \
mrudul_uchil Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><ins>+/*
+ * Portions Copyright 2014 ForgeRock AS
+ */
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.authentication.util.AMAuthUtils;
</span><span class="lines">@@ -56,7 +58,9 @@
</span><span class="cx"> * of <code>Condition</code> that lets you \
define authentication module </span><span class="cx"> * instances for which a \
<code>Policy</code> applies. </span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.AuthSchemeCondition} instead. \
</ins><span class="cx"> */ </span><ins>+@Deprecated
</ins><span class="cx"> public class AuthSchemeCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> private static final Debug DEBUG
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsAuthenticateToRealmConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToRealmCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToRealmCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToRealmCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,9 +25,8 @@
</span><span class="cx"> * $Id: AuthenticateToRealmCondition.java,v 1.6 2009/06/19 \
22:53:42 mrudul_uchil Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> /*
</span><del>- * Portions Copyrighted 2013 ForgeRock AS
</del><ins>+ * Portions Copyrighted 2013-2014 ForgeRock AS
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="lines">@@ -58,7 +57,9 @@
</span><span class="cx"> * implementation of <code>Condition</code> \
that lets you specify </span><span class="cx"> * the realm to which user should \
authenticate for the policy to apply </span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.AuthenticateToRealmCondition} \
instead. </ins><span class="cx"> */
</span><ins>+@Deprecated
</ins><span class="cx"> public class AuthenticateToRealmCondition implements \
Condition { </span><span class="cx">
</span><span class="cx"> private static final Debug DEBUG
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsAuthenticateToServiceConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToServiceCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToServiceCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/AuthenticateToServiceCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,10 +25,12 @@
</span><span class="cx"> * $Id: AuthenticateToServiceCondition.java,v 1.7 2009/05/05 \
18:29:01 mrudul_uchil Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><ins>+/*
+ * Portions Copyright 2014 ForgeRock AS
+ */
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.authentication.util.AMAuthUtils;
</span><span class="lines">@@ -56,7 +58,10 @@
</span><span class="cx"> * implementation of <code>Condition</code> \
that lets you specify </span><span class="cx"> * the service to which user should \
authenticate for the policy to apply </span><span class="cx"> *
</span><ins>+ * @deprecated See {@link \
org.forgerock.openam.entitlement.conditions.environment.AuthenticateToServiceCondition}
+ * instead.
</ins><span class="cx"> */
</span><ins>+@Deprecated
</ins><span class="cx"> public class AuthenticateToServiceCondition implements \
Condition { </span><span class="cx">
</span><span class="cx"> private static final Debug DEBUG
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsIPConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/IPCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/IPCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/IPCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,11 +25,11 @@
</span><span class="cx"> * $Id: IPCondition.java,v 1.5 2009/05/05 18:29:01 \
mrudul_uchil Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> /*
</span><span class="cx"> * Portions Copyrighted 2011-2014 ForgeRock AS
</span><span class="cx"> * Portions Copyrighted 2014 Nomura Research Institute, Ltd
</span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.policy.interfaces.Condition;
</span><span class="lines">@@ -57,7 +57,9 @@
</span><span class="cx"> * of <code>Condition</code>. This lets you \
define the IP addresses, </span><span class="cx"> * IP address ranges and DNS name \
patterns for which the policy applies </span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.IPCondition} instead. \
</ins><span class="cx"> */ </span><ins>+@Deprecated
</ins><span class="cx"> public class IPCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> private static final Debug DEBUG
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsLDAPFilterConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPFilterCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPFilterCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/LDAPFilterCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,13 +25,13 @@
</span><span class="cx"> * $Id: LDAPFilterCondition.java,v 1.8 2009/11/20 23:52:55 \
ww203982 Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> /*
</span><del>- * Portions Copyrighted 2010-2011 ForgeRock AS
</del><ins>+ * Portions Copyrighted 2010-2014 ForgeRock AS
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx"> import java.util.ArrayList;
</span><ins>+import java.util.Collection;
</ins><span class="cx"> import java.util.Collections;
</span><span class="cx"> import java.util.Iterator;
</span><span class="cx"> import java.util.Locale;
</span><span class="lines">@@ -75,8 +75,10 @@
</span><span class="cx"> * user identified by sso token, in the directory specified
</span><span class="cx"> * in policy configuration service, satisfiies the ldap \
filter </span><span class="cx"> * specified in the condition
</span><ins>+ *
+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.LDAPFilterCondition} instead. \
</ins><span class="cx"> */ </span><del>-
</del><ins>+@Deprecated
</ins><span class="cx"> public class LDAPFilterCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> static final String LDAP_SCOPE_BASE = \
"SCOPE_BASE"; </span><span class="lines">@@ -658,9 +660,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //validate LDAP_FILTER
</span><del>- Set ldapFilterSet = (Set) properties.get(LDAP_FILTER);
- if ( ldapFilterSet != null ) {
- validateLdapFilterSet(ldapFilterSet);
</del><ins>+ Collection ldapFilterCollection = (Collection) \
properties.get(LDAP_FILTER); + if ( ldapFilterCollection != null ) {
+ validateLdapFilterCollection(ldapFilterCollection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -673,7 +675,7 @@
</span><span class="cx"> * @see #LDAP_FILTER
</span><span class="cx"> */
</span><span class="cx">
</span><del>- private boolean validateLdapFilterSet(Set ldapFilterSet)
</del><ins>+ private boolean validateLdapFilterCollection(Collection \
ldapFilterSet) </ins><span class="cx"> throws PolicyException {
</span><span class="cx"> if ( ldapFilterSet.isEmpty() ) {
</span><span class="cx"> String args[] = { LDAP_FILTER };
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsLEAuthLevelConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/LEAuthLevelCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/LEAuthLevelCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/LEAuthLevelCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,6 +25,9 @@
</span><span class="cx"> * $Id: LEAuthLevelCondition.java,v 1.5 2008/06/25 05:43:51 \
qcheng Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><ins>+/*
+ * Portions Copyright 2014 ForgeRock AS
+ */
</ins><span class="cx">
</span><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="lines">@@ -59,7 +62,9 @@
</span><span class="cx"> * <code>env</code> map, \
<code>AuthLevel</code> is looked up from single sign on </span><span \
class="cx"> * token. </span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.LEAuthLevelCondition} \
instead. </ins><span class="cx"> */
</span><ins>+@Deprecated
</ins><span class="cx"> public class LEAuthLevelCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> private static final Debug DEBUG
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsResourceEnvIPConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/ResourceEnvIPCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/ResourceEnvIPCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/ResourceEnvIPCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,11 +25,11 @@
</span><span class="cx"> * $Id: ResourceEnvIPCondition.java,v 1.4 2009/07/21 \
18:33:17 mrudul_uchil Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> /*
</span><del>- * Portions Copyrighted 2011-2013 ForgeRock Inc
</del><ins>+ * Portions Copyrighted 2011-2014 ForgeRock AS
</ins><span class="cx"> * Portions Copyrighted 2012 Open Source Solution Technology \
Corporation </span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="cx"> import java.util.Set;
</span><span class="lines">@@ -74,8 +74,10 @@
</span><span class="cx"> * condition decision and advices based on the client's \
environment or </span><span class="cx"> * resource such as IP address, DNS host \
name, location, etc. </span><span class="cx"> * For the first drop, we are only \
supporting IP address. </span><ins>+ *
+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.ResourceEnvIPCondition \
instead}. </ins><span class="cx"> */
</span><del>-
</del><ins>+@Deprecated
</ins><span class="cx"> public class ResourceEnvIPCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> private static final Debug DEBUG
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsSessionConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,10 +25,12 @@
</span><span class="cx"> * $Id: SessionCondition.java,v 1.4 2008/06/25 05:43:52 \
qcheng Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><ins>+/*
+ * Portions Copyright 2014 ForgeRock AS
+ */
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -64,7 +66,9 @@
</span><span class="cx"> * to terminate the user session if the session time exceeds \
the </span><span class="cx"> * maximum allowed.
</span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.SessionCondition} instead. \
</ins><span class="cx"> */ </span><ins>+@Deprecated
</ins><span class="cx"> public class SessionCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsSessionPropertyConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionPropertyCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionPropertyCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SessionPropertyCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,6 +25,9 @@
</span><span class="cx"> * $Id: SessionPropertyCondition.java,v 1.4 2008/06/25 \
05:43:52 qcheng Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><ins>+/*
+ * Portions Copyright 2014 ForgeRock AS
+ */
</ins><span class="cx">
</span><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx"> import java.util.ArrayList;
</span><span class="lines">@@ -54,8 +57,10 @@
</span><span class="cx"> * implementation of <code>Condition</code> \
interface. </span><span class="cx"> * This condition checks whether session \
properties contain at least </span><span class="cx"> * one value of the each \
property listed in the <code>Condition</code> </span><ins>+ *
+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.SessionPropertyCondition} \
instead. </ins><span class="cx"> */
</span><del>-
</del><ins>+@Deprecated
</ins><span class="cx"> public class SessionPropertyCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> private static final boolean IGNORE_VALUE_CASE_DEFAULT = \
true; </span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavacomsunidentitypolicypluginsSimpleTimeConditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SimpleTimeCondition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SimpleTimeCondition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/com/sun/identity/policy/plugins/SimpleTimeCondition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,10 +25,10 @@
</span><span class="cx"> * $Id: SimpleTimeCondition.java,v 1.5 2010/01/05 22:00:26 \
dillidorai Exp $ </span><span class="cx"> *
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> /*
</span><del>- * Portions Copyrighted [2011] [ForgeRock AS]
</del><ins>+ * Portions Copyrighted 2011-2014 ForgeRock AS
</ins><span class="cx"> */
</span><ins>+
</ins><span class="cx"> package com.sun.identity.policy.plugins;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.policy.interfaces.Condition;
</span><span class="lines">@@ -49,7 +49,9 @@
</span><span class="cx"> * of <code>Condition</code>. This lets you \
define the time range </span><span class="cx"> * of week days and/or date range \
during which a policy applies. </span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.SimpleTimeCondition} instead. \
</ins><span class="cx"> */ </span><ins>+@Deprecated
</ins><span class="cx"> public class SimpleTimeCondition implements Condition {
</span><span class="cx">
</span><span class="cx"> /** Key that is used to define current time that is \
passed in the </span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavaorgforgerockopenamnetworkipv4IPv4Conditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/network/ipv4/IPv4Condition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/network/ipv4/IPv4Condition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/network/ipv4/IPv4Condition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -25,10 +25,10 @@
</span><span class="cx"> * $Id: .java,v 1.5 2009/05/05 18:29:01 mrudul_uchil Exp $
</span><span class="cx"> *
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> /*
</span><del>- * Portions Copyrighted [2011-2013] [ForgeRock Inc]
</del><ins>+ * Portions Copyrighted 2011-2014 ForgeRock AS
</ins><span class="cx"> */
</span><ins>+
</ins><span class="cx"> package org.forgerock.openam.network.ipv4;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.policy.interfaces.Condition;
</span><span class="lines">@@ -59,7 +59,9 @@
</span><span class="cx"> * of <code>Condition</code>. This lets you \
define the IP addresses, </span><span class="cx"> * IP address ranges and DNS name \
patterns for which the policy applies </span><span class="cx"> *
</span><ins>+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.IPv4Condition} instead. \
</ins><span class="cx"> */ </span><ins>+@Deprecated
</ins><span class="cx"> public class IPv4Condition implements Condition {
</span><span class="cx">
</span><span class="cx"> /** Key that is used in \
<code>IPv4Condition</code> to define the IP address \
</span></span></pre></div> <a \
id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavaorgforgerockopenamnetworkipv6IPv6Conditionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/network/ipv6/IPv6Condition.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/network/ipv6/IPv6Condition.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/network/ipv6/IPv6Condition.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * DO NOT REMOVE COPYRIGHT NOTICES OR THIS HEADER.
</span><span class="cx"> *
</span><del>- * Copyright (c) 2013 ForgeRock Inc. All rights reserved.
</del><ins>+ * Copyright 2013-2014 ForgeRock AS
</ins><span class="cx"> *
</span><span class="cx"> * The contents of this file are subject to the terms
</span><span class="cx"> * of the Common Development and Distribution License
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> * your own identifying information:
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><ins>+
</ins><span class="cx"> package org.forgerock.openam.network.ipv6;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -38,7 +39,10 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author alin.brici@forgerock.com
</span><ins>+ *
+ * @deprecated Use {@link \
org.forgerock.openam.entitlement.conditions.environment.IPv6Condition} instead. \
</ins><span class="cx"> */ </span><ins>+@Deprecated
</ins><span class="cx"> public class IPv6Condition implements Condition {
</span><span class="cx"> /** Key that is used in \
<code>IPv6Condition</code> to define the IP address </span><span \
class="cx"> * values for which a policy applies. The value corresponding to the \
key </span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainjavaorgforgerockopenamupgradestepspolicyconditionsPolicyConditionUpgradeMapjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org/forgerock/openam/upgrade/steps/policy/conditions/PolicyConditionUpgradeMap.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java/org \
/forgerock/openam/upgrade/steps/policy/conditions/PolicyConditionUpgradeMap.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/java \
/org/forgerock/openam/upgrade/steps/policy/conditions/PolicyConditionUpgradeMap.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -16,17 +16,38 @@
</span><span class="cx">
</span><span class="cx"> package \
org.forgerock.openam.upgrade.steps.policy.conditions; </span><span class="cx">
</span><ins>+import com.sun.identity.authentication.util.AMAuthUtils;
</ins><span class="cx"> import com.sun.identity.entitlement.EntitlementCondition;
</span><ins>+import com.sun.identity.entitlement.EntitlementException;
</ins><span class="cx"> import com.sun.identity.entitlement.EntitlementSubject;
</span><span class="cx"> import com.sun.identity.entitlement.opensso.PolicyCondition;
</span><span class="cx"> import com.sun.identity.entitlement.opensso.PolicySubject;
</span><ins>+import com.sun.identity.policy.interfaces.Condition;
+import org.forgerock.json.fluent.JsonValue;
+import org.forgerock.openam.entitlement.conditions.environment.AMIdentityMembershipCondition;
+import org.forgerock.openam.entitlement.conditions.environment.AuthLevelCondition;
+import org.forgerock.openam.entitlement.conditions.environment.AuthSchemeCondition;
+import org.forgerock.openam.entitlement.conditions.environment.AuthenticateToRealmCondition;
+import org.forgerock.openam.entitlement.conditions.environment.AuthenticateToServiceCondition;
+import org.forgerock.openam.entitlement.conditions.environment.ConditionConstants;
+import org.forgerock.openam.entitlement.conditions.environment.IPCondition;
+import org.forgerock.openam.entitlement.conditions.environment.LDAPFilterCondition;
+import org.forgerock.openam.entitlement.conditions.environment.LEAuthLevelCondition;
+import org.forgerock.openam.entitlement.conditions.environment.ResourceEnvIPCondition;
+import org.forgerock.openam.entitlement.conditions.environment.SessionCondition;
+import org.forgerock.openam.entitlement.conditions.environment.SessionPropertyCondition;
+import org.forgerock.openam.entitlement.conditions.environment.SimpleTimeCondition;
+import org.forgerock.openam.network.ipv4.IPv4Condition;
</ins><span class="cx"> import \
org.forgerock.openam.entitlement.conditions.subject.AMIdentitySubject; </span><span \
class="cx"> import org.forgerock.openam.entitlement.conditions.subject.AuthenticatedUsers;
</span><span class="cx">
</span><ins>+import java.util.ArrayList;
</ins><span class="cx"> import java.util.HashMap;
</span><span class="cx"> import java.util.Map;
</span><span class="cx"> import java.util.Set;
</span><span class="cx">
</span><ins>+import static \
org.forgerock.openam.entitlement.conditions.environment.ConditionConstants.VALUE_CASE_INSENSITIVE;
+
</ins><span class="cx"> /**
</span><span class="cx"> * A map containing all the migration logic from an old \
policy condition to a new entitlement condition. </span><span class="cx"> *
</span><span class="lines">@@ -59,6 +80,279 @@
</span><span class="cx"> });
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+ \
environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.AuthLevelCondition.class.getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + AuthLevelCondition \
eCondition = new AuthLevelCondition(); + Map<String, \
Set<String>> properties = condition.getProperties(); +
+ String propAuthLevel = \
getValue(properties.get(ConditionConstants.AUTH_LEVEL)); + int \
authLevel = Integer.parseInt(AMAuthUtils.getDataFromRealmQualifiedData(propAuthLevel));
+
+ eCondition.setAuthLevel(authLevel);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.AuthLevelCondition.class.getName(), + \
AuthLevelCondition.class.getName()); + return eCondition;
+ }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.LEAuthLevelCondition.class.getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + LEAuthLevelCondition \
eCondition = new LEAuthLevelCondition(); + Map<String, \
Set<String>> properties = condition.getProperties(); +
+ String propAuthLevel = \
getValue(properties.get(ConditionConstants.AUTH_LEVEL)); + int \
authLevel = Integer.parseInt(AMAuthUtils.getDataFromRealmQualifiedData(propAuthLevel));
+
+ eCondition.setAuthLevel(authLevel);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.LEAuthLevelCondition.class.getName(), + \
LEAuthLevelCondition.class.getName()); + return eCondition;
+ }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.AuthenticateToServiceCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + \
AuthenticateToServiceCondition eCondition = new AuthenticateToServiceCondition(); + \
Map<String, Set<String>> properties = condition.getProperties(); +
+ String authenticationService =
+ \
getValue(properties.get(ConditionConstants.AUTHENTICATE_TO_SERVICE)); +
+ eCondition.setAuthenticateToService(authenticationService);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.AuthenticateToServiceCondition.class.getName(), + \
AuthenticateToServiceCondition.class.getName()); + return \
eCondition; + }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.AuthenticateToRealmCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + \
AuthenticateToRealmCondition eCondition = new AuthenticateToRealmCondition(); + \
Map<String, Set<String>> properties = condition.getProperties(); +
+ String authenticationRealm =
+ \
getValue(properties.get(ConditionConstants.AUTHENTICATE_TO_REALM)); +
+ eCondition.setAuthenticateToRealm(authenticationRealm);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.AuthenticateToRealmCondition.class.getName(), + \
AuthenticateToRealmCondition.class.getName()); + return \
eCondition; + }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.AMIdentityMembershipCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + \
AMIdentityMembershipCondition eCondition = new AMIdentityMembershipCondition(); + \
Map<String, Set<String>> properties = condition.getProperties(); +
+ Set<String> amIdentityNames = \
properties.get(ConditionConstants.AM_IDENTITY_NAME); +
+ eCondition.setAmIdentityNames(amIdentityNames);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.AMIdentityMembershipCondition.class.getName(), + \
AMIdentityMembershipCondition.class.getName()); + return \
eCondition; + }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.SessionCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + SessionCondition \
eCondition = new SessionCondition(); + Map<String, \
Set<String>> properties = condition.getProperties(); +
+ Long maxSessionTime =
+ \
Long.parseLong(getValue(properties.get(ConditionConstants.MAX_SESSION_TIME))); + \
boolean terminateSession = + \
getValue(properties.get(ConditionConstants.TERMINATE_SESSION)).contains("true");
+
+ eCondition.setMaxSessionTime(maxSessionTime);
+ eCondition.setTerminateSession(terminateSession);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.SessionCondition.class.getName(), + \
SessionCondition.class.getName()); + return eCondition;
+ }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.SimpleTimeCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + SimpleTimeCondition \
eCondition = new SimpleTimeCondition(); + Map<String, \
Set<String>> properties = condition.getProperties(); +
+ String startTime = \
getValue(properties.get(Condition.START_TIME)); + String \
endTime = getValue(properties.get(Condition.END_TIME)); + \
String startDay = getValue(properties.get(Condition.START_DAY)); + \
String endDay = getValue(properties.get(Condition.END_DAY)); + \
String startDate = getValue(properties.get(Condition.START_DATE)); + \
String endDate = getValue(properties.get(Condition.END_DATE)); + \
String enforcementTimeZone = \
getValue(properties.get(Condition.ENFORCEMENT_TIME_ZONE)); +
+ eCondition.setStartTime(startTime);
+ eCondition.setEndTime(endTime);
+ eCondition.setStartDay(startDay);
+ eCondition.setEndDay(endDay);
+ eCondition.setStartDate(startDate);
+ eCondition.setEndDate(endDate);
+ eCondition.setEnforcementTimeZone(enforcementTimeZone);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.SimpleTimeCondition.class.getName(), + \
SimpleTimeCondition.class.getName()); + return eCondition;
+ }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.SessionPropertyCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + SessionPropertyCondition \
eCondition = new SessionPropertyCondition(); + Map<String, \
Set<String>> properties = condition.getProperties(); +
+ Map<String, Set<String>> props = new \
HashMap<String, Set<String>>(properties); + String \
ignoreValueCaseString = getValue(props.remove(VALUE_CASE_INSENSITIVE)); + \
boolean ignoreValueCase = true; + if (ignoreValueCaseString != \
null && !ignoreValueCaseString.isEmpty()) { + \
ignoreValueCase = Boolean.parseBoolean(ignoreValueCaseString); + \
} +
+ eCondition.setProperties(props);
+ eCondition.setIgnoreValueCase(ignoreValueCase);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.SessionPropertyCondition.class.getName(), + \
SessionPropertyCondition.class.getName()); + return \
eCondition; + }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.AuthSchemeCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + AuthSchemeCondition \
eCondition = new AuthSchemeCondition(); + Map<String, \
Set<String>> properties = condition.getProperties(); +
+ Set<String> authScheme = \
properties.get(Condition.AUTH_SCHEME); + String \
applicationName = getValue(properties.get(Condition.APPLICATION_NAME)); + \
String idleTimeoutString = \
getValue(properties.get(Condition.APPLICATION_IDLE_TIMEOUT)); + \
int idleTimeout = 0; + if (idleTimeoutString != null) {
+ idleTimeout = Integer.parseInt(idleTimeoutString);
+ }
+
+ eCondition.setAuthScheme(authScheme);
+ eCondition.setApplicationName(applicationName);
+ eCondition.setApplicationIdleTimeout(idleTimeout);
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.AuthSchemeCondition.class.getName(), + \
AuthSchemeCondition.class.getName()); + return eCondition;
+ }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.IPCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + IPCondition eCondition = \
new IPCondition(); + Map<String, Set<String>> \
properties = condition.getProperties(); +
+ Set<String> ipRange = \
properties.get(IPv4Condition.IP_RANGE); + Set<String> \
dnsName = properties.get(Condition.DNS_NAME); + String startIp \
= getValue(properties.get(Condition.START_IP)); + String endIp \
= getValue(properties.get(Condition.END_IP)); +
+ try {
+ if (ipRange != null) {
+ eCondition.setIpRange(new \
ArrayList<String>(ipRange)); + }
+ if (dnsName != null){
+ eCondition.setDnsName(new \
ArrayList<String>(dnsName)); + }
+ eCondition.setStartIp(startIp);
+ eCondition.setEndIp(endIp);
+ } catch (EntitlementException e) {
+ throw new RuntimeException(e);
+ }
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.IPCondition.class.getName(), + \
IPCondition.class.getName()); + return eCondition;
+ }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.LDAPFilterCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + LDAPFilterCondition \
eCondition = new LDAPFilterCondition(); + Map<String, \
Set<String>> properties = condition.getProperties(); +
+ eCondition.setState(new JsonValue(properties).toString());
+
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.LDAPFilterCondition.class.getName(), + \
LDAPFilterCondition.class.getName()); + return eCondition;
+ }
+ });
+
+ environmentConditionsUpgradeMap.put(com.sun.identity.policy.plugins.ResourceEnvIPCondition.class
+ .getName(),
+ new EntitlementConditionMigrator() {
+ @Override
+ public EntitlementCondition migrate(PolicyCondition condition, \
MigrationReport migrationReport) { + ResourceEnvIPCondition \
eCondition = new ResourceEnvIPCondition(); + Map<String, \
Set<String>> properties = condition.getProperties(); +
+ Set<String> resourceEnvIPConditionValue =
+ \
properties.get(ResourceEnvIPCondition.ENV_CONDITION_VALUE); +
+ \
eCondition.setResourceEnvIPConditionValue(resourceEnvIPConditionValue); +
+ migrationReport.migratedEnvironmentCondition(
+ \
com.sun.identity.policy.plugins.ResourceEnvIPCondition.class.getName(), + \
ResourceEnvIPCondition.class.getName()); + return eCondition;
+ }
+ });
+
</ins><span class="cx"> \
subjectConditionsUpgradeMap.put(com.sun.identity.policy.plugins.AMIdentitySubject.class.getName(),
</span><span class="cx"> new SubjectConditionMigrator() {
</span><span class="cx"> @Override
</span><span class="lines">@@ -92,6 +386,13 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ private <T> T getValue(Set<T> values) {
+ if (values != null && values.iterator().hasNext()) {
+ return values.iterator().next();
+ }
+ return null;
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Returns {@code true} if there exists an entry for \
migrating the specified old policy subject condition class. </span><span class="cx"> \
* </span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamcoresrcmainresourcesEntitlementExceptionproperties"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/resources/EntitlementException.properties \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/resources/EntitlementException.properties 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-core/src/main/resources/EntitlementException.properties 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -158,9 +158,26 @@
</span><span class="cx"> 434=Cannot authenticate request.
</span><span class="cx"> 435=Notification URL is malformed.
</span><span class="cx"> 436=Notification URL is missing.
</span><ins>+437=Requested client IP address must be specified.
+438=The resource or environment is not supported currently {0}.
</ins><span class="cx">
</span><span class="cx"> 450=Unable to search applications.
</span><span class="cx"> 451=Unable to search applications because administrator \
Single Sign On token is absent. </span><span class="cx">
</span><ins>+700=Invalid OAuth2 Scope ''{0}'': See RFC 6749 section 3.3 for allowed \
values. +710=AuthLevel value {0} not an integer
+711={0} property value should be defined.
+712=requestAuthLevel in request env not an Integer or Set.
+713=Authentication module instance can not be retrieved: {0}.
+720=Invalid administrator user ID or password from DSConfigMgr.
+721=AMIdentitySubject - can not check membership for user {0} and subject {1}
+730=Unable to parse SSO token authInstant to Date.
+740=At least one of the properties Start Date, Start Time, Start Day should be \
defined with non null value. +741=Should define value for {1}, since value is defined \
for {0} +750=Start IP can not be larger than end IP.
+
+800={0} property value should be an Integer.
+801={0} property value should be a Set of string values.
+
</ins><span class="cx"> resource.validation.does.not.match.valid.resources={0} did \
not match any valid resources. </span><span class="cx"> \
resource.validation.invalid.resource={0} was invalid. </span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamdocumentationopenamdocsource"></a>
<div class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-documentation/openam-doc-source</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-2629/openam/openam-documentation/openam-doc-source:7585-7632
</span><span class="cx">/branches/AME-3405-session-read-from-cts/openam/openam-documentation/openam-doc-source:8749-8823
</span><span class="cx">/branches/AME-3423/openam/openam-documentation/openam-doc-source:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/openam/openam-documentation/openam-doc-source:9534-9723
</span><span class="cx">/branches/AME-3719/openam/openam-documentation/openam-doc-source:9517-9879
</span><span class="cx">/branches/AME-3726-script-sandboxing/openam/openam-documentation/openam-doc-source:9663-9819
</span><span class="cx">/branches/AME-4378/openam/openam-documentation/openam-doc-source:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam/openam-documentation/openam-doc-source:10437-10535
</span><span class="cx">/branches/AME-4547/openam/openam-documentation/openam-doc-source:10585-10783
</span><span class="cx">/branches/CTS-Async/openam/openam-documentation/openam-doc-source:8847-9739
</span><span class="cx">/branches/IIS7PostData/openam/openam-documentation/openam-doc-source:224-261
</span><span class="cx">/branches/IIS7PostData/openam/openam-documentation/openam-site:224-261
</span><span class="cx">/branches/OAuth2_Maven/openam/openam-documentation/openam-doc-source:2756-3584
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/openam/openam-documentation/openam-doc-source:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/openam/openam-documentation/openam-doc-source:6910-6946
</span><span class="cx">/branches/OPENAM-3130-session-quota/openam/openam-documentation/openam-doc-source:6958-6972
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/openam/openam-documentation/openam-doc-source:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/openam/openam-documentation/openam-doc-source:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/openam/openam-documentation/openam-doc-source:8747-8835
</span><span class="cx">/branches/OPENAM-4028-connection-pool/openam/openam-documentation/openam-doc-source:9750-10171
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/openam/openam-documentation/openam-doc-source:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/openam/openam-documentation/openam-doc-source:7834-7844
</span><span class="cx">/branches/ame4272/openam/openam-documentation/openam-doc-source:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/openam/openam-documentation/openam-doc-source:7508-7697
</span><span class="cx">/branches/andyAme3102/openam/openam-documentation/openam-doc-source:8312-8413
</span><span class="cx">/branches/andyOpenam1708/openam/openam-documentation/openam-doc-source:5576-5592
</span><span class="cx">/branches/maven_merge/openam/openam-documentation/openam-doc-source:2556-3124
</span><span class="cx">/branches/maven_merge/openam/openam-documentation/openam-site:2556-2631
</span><span class="cx">/branches/oidc_authn/openam-documentation/openam-doc-source:8507,8540,8557-8559,8565-8566
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/openam/openam-documentation/openam-doc-source:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/openam/openam-documentation/openam-doc-source:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/openam/openam-documentation/openam-doc-source:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/openam/openam-documentation/openam-doc-source:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/openam/openam-documentation/openam-doc-source:6767-6804
</span><span class="cx">/branches/openam_10.1.0_SAML2_FIXES/openam-documentation/openam-doc-source:3725-3740
</span><span class="cx">/branches/openam_10.1.0_jeff/openam-documentation/openam-doc-source:3128-3527
</span><span class="cx">/branches/openam_10.1.0_jeff/openam-documentation/openam-site:3128-3287
</span><span class="cx">/branches/openam_10.1.0_xacml3_JAS/openam/openam-documentation/openam-doc-source:4039-4140
</span><span class="cx">/branches/openam_10.2.0_xacml3_JAS/openam/openam-documentation/openam-doc-source:4141-4379
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/openam/openam-documentation/openam-doc-source:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/openam/openam-documentation/openam-doc-source:8476-8577
</span><span class="cx">/branches/pcunnington-oauth2/openam/openam-documentation/openam-doc-source:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/openam/openam-documentation/openam-doc-source:8314-8341
</span><span class="cx">/branches/rest_sts_view_bean/openam-documentation/openam-doc-source:9690-9965
</span><span class="cx">/branches/rwapshott-AME-1739/openam/openam-documentation/openam-doc-source:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/openam/openam-documentation/openam-doc-source:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/openam/openam-documentation/openam-doc-source:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/openam/openam-documentation/openam-doc-source:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2027-cts-oids-should-follow-fr-oid-scheme/openam/openam-documentation/openam-doc-source:5609-5614
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/openam/openam-documentation/openam-doc-source:6086-6319
</span><span class="cx">/branches/rwapshott-ame-2311-index-names/openam/openam-documentation/openam-doc-source:6058-6069
</span><span class="cx">/branches/rwapshott-ame-258-cts-replication/openam/openam-documentation/openam-doc-source:5548-6055
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/openam/openam-documentation/openam-doc-source:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/openam/openam-documentation/openam-doc-source:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/openam/openam-documentation/openam-doc-source:6170-6194
</span><span class="cx">/branches/rwapshott-openam-2729-saml2-error/openam/openam-documentation/openam-doc-source:6247-6257
</span><span class="cx">/branches/sts_oidc_saml_redux/openam-documentation/openam-doc-source:8417-8422,8424,8440,8445-8446,8460,8490,8498
</span><span class="cx">/branches/sts_restart_persistence/openam-documentation/openam-doc-source:9003-9005,9009-9414
</span><span class="cx">/branches/sts_saml2_encrypt/openam-documentation/openam-doc-source:10424-10472,10474-10550
</span><span class="cx">/branches/sts_service_listeners/openam-documentation/openam-doc-source:9968-10031,10047-10048,10053
</span><span class="cx">/branches/sts_token_gen_service/openam-documentation/openam-d \
oc-source:8706,8717-8720,8723-8725,8727-8728,8731,8737,8740-8742,8759-8760,8774-8776,8796-8797,8800-8801,8818-8819,8821
</span><span class="cx">/branches/sts_token_gen_service2/openam-documentation/openam-doc-source:8844-8887,8894-9000
</span><span class="cx">/branches/sts_x509/openam-documentation/openam-doc-source:10206-10398
</span><span class="cx">/trunk/openam/openam-documentation/openam-doc-source:3127-3332,10625,10631,10633,10638,10640,10643,10648,10674,10686,10761-10762,10784
</span><span class="cx">/trunk/openam/openam-documentation/openam-site:2556-2930
</span><span class="cx">/trunk/opensso/openam-site:2912-3070
</span><span class="cx"> + \
/branches/AME-2526-SFO-between-sites/openam/openam-documentation/openam-doc-source:7510-8258
</span><span class="cx">/branches/AME-2629/openam/openam-documentation/openam-doc-source:7585-7632
</span><span class="cx">/branches/AME-3405-session-read-from-cts/openam/openam-documentation/openam-doc-source:8749-8823
</span><span class="cx">/branches/AME-3423/openam/openam-documentation/openam-doc-source:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/openam/openam-documentation/openam-doc-source:9534-9723
</span><span class="cx">/branches/AME-3719/openam/openam-documentation/openam-doc-source:9517-9879
</span><span class="cx">/branches/AME-3726-script-sandboxing/openam/openam-documentation/openam-doc-source:9663-9819
</span><span class="cx">/branches/AME-4378/openam/openam-documentation/openam-doc-source:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam/openam-documentation/openam-doc-source:10437-10535
</span><span class="cx">/branches/AME-4547/openam/openam-documentation/openam-doc-source:10585-10783
</span><span class="cx">/branches/AME-4595/openam/openam-documentation/openam-doc-source:10581-10789
</span><span class="cx">/branches/CTS-Async/openam/openam-documentation/openam-doc-source:8847-9739
</span><span class="cx">/branches/IIS7PostData/openam/openam-documentation/openam-doc-source:224-261
</span><span class="cx">/branches/IIS7PostData/openam/openam-documentation/openam-site:224-261
</span><span class="cx">/branches/OAuth2_Maven/openam/openam-documentation/openam-doc-source:2756-3584
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/openam/openam-documentation/openam-doc-source:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/openam/openam-documentation/openam-doc-source:6910-6946
</span><span class="cx">/branches/OPENAM-3130-session-quota/openam/openam-documentation/openam-doc-source:6958-6972
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/openam/openam-documentation/openam-doc-source:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/openam/openam-documentation/openam-doc-source:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/openam/openam-documentation/openam-doc-source:8747-8835
</span><span class="cx">/branches/OPENAM-4028-connection-pool/openam/openam-documentation/openam-doc-source:9750-10171
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/openam/openam-documentation/openam-doc-source:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/openam/openam-documentation/openam-doc-source:7834-7844
</span><span class="cx">/branches/ame4272/openam/openam-documentation/openam-doc-source:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/openam/openam-documentation/openam-doc-source:7508-7697
</span><span class="cx">/branches/andyAme3102/openam/openam-documentation/openam-doc-source:8312-8413
</span><span class="cx">/branches/andyOpenam1708/openam/openam-documentation/openam-doc-source:5576-5592
</span><span class="cx">/branches/maven_merge/openam/openam-documentation/openam-doc-source:2556-3124
</span><span class="cx">/branches/maven_merge/openam/openam-documentation/openam-site:2556-2631
</span><span class="cx">/branches/oidc_authn/openam-documentation/openam-doc-source:8507,8540,8557-8559,8565-8566
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/openam/openam-documentation/openam-doc-source:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/openam/openam-documentation/openam-doc-source:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/openam/openam-documentation/openam-doc-source:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/openam/openam-documentation/openam-doc-source:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/openam/openam-documentation/openam-doc-source:6767-6804
</span><span class="cx">/branches/openam_10.1.0_SAML2_FIXES/openam-documentation/openam-doc-source:3725-3740
</span><span class="cx">/branches/openam_10.1.0_jeff/openam-documentation/openam-doc-source:3128-3527
</span><span class="cx">/branches/openam_10.1.0_jeff/openam-documentation/openam-site:3128-3287
</span><span class="cx">/branches/openam_10.1.0_xacml3_JAS/openam/openam-documentation/openam-doc-source:4039-4140
</span><span class="cx">/branches/openam_10.2.0_xacml3_JAS/openam/openam-documentation/openam-doc-source:4141-4379
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/openam/openam-documentation/openam-doc-source:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/openam/openam-documentation/openam-doc-source:8476-8577
</span><span class="cx">/branches/pcunnington-oauth2/openam/openam-documentation/openam-doc-source:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/openam/openam-documentation/openam-doc-source:8314-8341
</span><span class="cx">/branches/rest_sts_view_bean/openam-documentation/openam-doc-source:9690-9965
</span><span class="cx">/branches/rwapshott-AME-1739/openam/openam-documentation/openam-doc-source:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/openam/openam-documentation/openam-doc-source:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/openam/openam-documentation/openam-doc-source:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/openam/openam-documentation/openam-doc-source:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2027-cts-oids-should-follow-fr-oid-scheme/openam/openam-documentation/openam-doc-source:5609-5614
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/openam/openam-documentation/openam-doc-source:6086-6319
</span><span class="cx">/branches/rwapshott-ame-2311-index-names/openam/openam-documentation/openam-doc-source:6058-6069
</span><span class="cx">/branches/rwapshott-ame-258-cts-replication/openam/openam-documentation/openam-doc-source:5548-6055
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/openam/openam-documentation/openam-doc-source:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/openam/openam-documentation/openam-doc-source:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/openam/openam-documentation/openam-doc-source:6170-6194
</span><span class="cx">/branches/rwapshott-openam-2729-saml2-error/openam/openam-documentation/openam-doc-source:6247-6257
</span><span class="cx">/branches/sts_oidc_saml_redux/openam-documentation/openam-doc-source:8417-8422,8424,8440,8445-8446,8460,8490,8498
</span><span class="cx">/branches/sts_restart_persistence/openam-documentation/openam-doc-source:9003-9005,9009-9414
</span><span class="cx">/branches/sts_saml2_encrypt/openam-documentation/openam-doc-source:10424-10472,10474-10550
</span><span class="cx">/branches/sts_service_listeners/openam-documentation/openam-doc-source:9968-10031,10047-10048,10053
</span><span class="cx">/branches/sts_token_gen_service/openam-documentation/openam-d \
oc-source:8706,8717-8720,8723-8725,8727-8728,8731,8737,8740-8742,8759-8760,8774-8776,8796-8797,8800-8801,8818-8819,8821
</span><span class="cx">/branches/sts_token_gen_service2/openam-documentation/openam-doc-source:8844-8887,8894-9000
</span><span class="cx">/branches/sts_x509/openam-documentation/openam-doc-source:10206-10398
</span><span class="cx">/trunk/openam/openam-documentation/openam-doc-source:3127-3332,10625,10631,10633,10638,10640,10643,10648,10674,10686,10761-10762,10784,10794
</span><span class="cx">/trunk/openam/openam-documentation/openam-site:2556-2930
</span><span class="cx">/trunk/opensso/openam-site:2912-3070
</span><a id="branchesAME4569XACMLResponseProviderSupportopenamopenamentitlementssrcmainjavacomsunidentityentitlementEntitlementExceptionjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/EntitlementException.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/EntitlementException.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/EntitlementException.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -84,7 +84,26 @@
</span><span class="cx"> public static final int MISSING_RESOURCE = 420;
</span><span class="cx"> public static final int JSON_PARSE_ERROR = 425;
</span><span class="cx"> public static final int AUTHENTICATION_ERROR = 434;
</span><ins>+ public static final int CLIENT_IP_EMPTY = 437;
+ public static final int RESOURCE_ENV_NOT_KNOWN = 438;
</ins><span class="cx">
</span><ins>+ public static final int CONDITION_EVALUTATION_FAILED = 510;
+
+ public static final int INVALID_OAUTH2_SCOPE = 700;
+ public static final int AUTH_LEVEL_NOT_INTEGER = 710;
+ public static final int PROPERTY_VALUE_NOT_DEFINED = 711;
+ public static final int AUTH_LEVEL_NOT_INT_OR_SET = 712;
+ public static final int AUTH_SCHEME_NOT_FOUND = 713;
+ public static final int INVALID_ADMIN = 720;
+ public static final int AM_ID_SUBJECT_MEMBERSHIP_EVALUATION_ERROR = 721;
+ public static final int UNABLE_TO_PARSE_SSOTOKEN_AUTHINSTANT = 730;
+ public static final int AT_LEAST_ONE_OF_TIME_PROPS_SHOULD_BE_DEFINED = 740;
+ public static final int PAIR_PROPERTY_NOT_DEFINED = 741;
+ public static final int END_IP_BEFORE_START_IP = 750;
+
+ public static final int PROPERTY_IS_NOT_AN_INTEGER = 800;
+ public static final int PROPERTY_IS_NOT_A_SET = 801;
+
</ins><span class="cx"> private int errorCode;
</span><span class="cx"> private String message;
</span><span class="cx"> private Object[] params;
</span><span class="lines">@@ -180,4 +199,4 @@
</span><span class="cx"> return (params != null) ? MessageFormat.format(msg, \
params) : </span><span class="cx"> msg;
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamopenamentitlementssrcmainjavaorgforgerockopenamentitlementEntitlementRegistryjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/EntitlementRegistry.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/EntitlementRegistry.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/EntitlementRegistry.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> registry.registerSubjectType("NOT", \
NotSubject.class); </span><span class="cx">
</span><span class="cx"> // Standard OpenAM entitlement conditions (policy \
conditions will be loaded later) </span><del>- \
registry.registerConditionType(IPCondition.class); </del><ins>+// \
registry.registerConditionType(IPCondition.class); </ins><span class="cx"> \
registry.registerConditionType(DNSNameCondition.class); </span><span class="cx"> \
registry.registerConditionType(NumericAttributeCondition.class); </span><span \
class="cx"> registry.registerConditionType(TimeCondition.class); \
</span></span></pre></div> <a \
id="branchesAME4569XACMLResponseProviderSupportopenamopenamoauth2"></a> <div \
class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-oauth2</h4> <pre \
class="diff"><span> </span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-2629/openam/openam-oauth2:7585-7632
</span><span class="cx">/branches/AME-3405-session-read-from-cts/openam/openam-oauth2:8749-8823
</span><span class="cx">/branches/AME-3423/openam/openam-oauth2:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/openam/openam-oauth2:9534-9723
</span><span class="cx">/branches/AME-3719/openam/openam-oauth2:9517-9879
</span><span class="cx">/branches/AME-3726-script-sandboxing/openam/openam-oauth2:9663-9819
</span><span class="cx">/branches/AME-4378/openam/openam-oauth2:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam/openam-oauth2:10437-10535
</span><span class="cx">/branches/AME-4547/openam/openam-oauth2:10585-10783
</span><span class="cx">/branches/CTS-Async/openam/openam-oauth2:8847-9739
</span><span class="cx">/branches/IIS7PostData/openam/openam-oauth2:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/openam/openam-oauth2:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/openam/openam-oauth2:6910-6946
</span><span class="cx">/branches/OPENAM-3130-session-quota/openam/openam-oauth2:6958-6972
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/openam/openam-oauth2:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/openam/openam-oauth2:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/openam/openam-oauth2:8747-8835
</span><span class="cx">/branches/OPENAM-4028-connection-pool/openam/openam-oauth2:9750-10171
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/openam/openam-oauth2:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/openam/openam-oauth2:7834-7844
</span><span class="cx">/branches/ame4272/openam/openam-oauth2:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/openam/openam-oauth2:7508-7697
</span><span class="cx">/branches/andyAme3102/openam/openam-oauth2:8312-8413
</span><span class="cx">/branches/maven_merge/openam/openam-oauth2:2556-2558,2756-3124
</span><span class="cx">/branches/oidc_authn/openam-oauth2:8507,8540,8557-8559,8565-8566
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/openam/openam-oauth2:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/openam/openam-oauth2:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/openam/openam-oauth2:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/openam/openam-oauth2:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/openam/openam-oauth2:6767-6804
</span><span class="cx">/branches/openam_10.1.0_SAML2_FIXES/openam-oauth2:3725-3740
</span><span class="cx">/branches/openam_10.1.0_jeff/openam-oauth2:3128-3527
</span><span class="cx">/branches/openam_10.1.0_xacml3_JAS/openam/openam-oauth2:4039-4140
</span><span class="cx">/branches/openam_10.2.0_xacml3_JAS/openam/openam-oauth2:4141-4379
</span><span class="cx">/branches/openid_connect_implementation/openam-oauth2:4140-5165
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/openam/openam-oauth2:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/openam/openam-oauth2:8476-8577
</span><span class="cx">/branches/pcunnington-oauth2/openam/openam-oauth2:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/openam/openam-oauth2:8314-8341
</span><span class="cx">/branches/rest_sts_view_bean/openam-oauth2:9690-9965
</span><span class="cx">/branches/rwapshott-AME-1739/openam/openam-oauth2:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/openam/openam-oauth2:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/openam/openam-oauth2:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/openam/openam-oauth2:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2027-cts-oids-should-follow-fr-oid-scheme/openam/openam-oauth2:5609-5614
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/openam/openam-oauth2:6086-6319
</span><span class="cx">/branches/rwapshott-ame-2311-index-names/openam/openam-oauth2:6058-6069
</span><span class="cx">/branches/rwapshott-ame-258-cts-replication/openam/openam-oauth2:5548-6055
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/openam/openam-oauth2:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/openam/openam-oauth2:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/openam/openam-oauth2:6170-6194
</span><span class="cx">/branches/rwapshott-openam-2729-saml2-error/openam/openam-oauth2:6247-6257
</span><span class="cx">/branches/sts_oidc_saml_redux/openam-oauth2:8417-8422,8424,8440,8445-8446,8460,8490,8498
</span><span class="cx">/branches/sts_restart_persistence/openam-oauth2:9003-9005,9009-9414
</span><span class="cx">/branches/sts_saml2_encrypt/openam-oauth2:10424-10472,10474-10550
</span><span class="cx">/branches/sts_service_listeners/openam-oauth2:9968-10031,10047-10048,10053
</span><span class="cx">/branches/sts_token_gen_service/openam-oauth2:8706,8717-8720, \
8723-8725,8727-8728,8731,8737,8740-8742,8759-8760,8774-8776,8796-8797,8800-8801,8818-8819,8821
</span><span class="cx">/branches/sts_token_gen_service2/openam-oauth2:8844-8887,8894-9000
</span><span class="cx">/branches/sts_x509/openam-oauth2:10206-10398
</span><span class="cx">/trunk/openam/openam-oauth2:3127-3577,10625,10631,10633,10638,10640,10643,10648,10784
</span><span class="cx"> + \
/branches/AME-2526-SFO-between-sites/openam/openam-oauth2:7510-8258 </span><span \
class="cx">/branches/AME-2629/openam/openam-oauth2:7585-7632 </span><span \
class="cx">/branches/AME-3405-session-read-from-cts/openam/openam-oauth2:8749-8823 \
</span><span class="cx">/branches/AME-3423/openam/openam-oauth2:10105-10414 \
</span><span class="cx">/branches/AME-3612-pcunnington/openam/openam-oauth2:9534-9723 \
</span><span class="cx">/branches/AME-3719/openam/openam-oauth2:9517-9879 \
</span><span class="cx">/branches/AME-3726-script-sandboxing/openam/openam-oauth2:9663-9819
</span><span class="cx">/branches/AME-4378/openam/openam-oauth2:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam/openam-oauth2:10437-10535
</span><span class="cx">/branches/AME-4547/openam/openam-oauth2:10585-10783
</span><span class="cx">/branches/AME-4595/openam/openam-oauth2:10581-10789
</span><span class="cx">/branches/CTS-Async/openam/openam-oauth2:8847-9739
</span><span class="cx">/branches/IIS7PostData/openam/openam-oauth2:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/openam/openam-oauth2:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/openam/openam-oauth2:6910-6946
</span><span class="cx">/branches/OPENAM-3130-session-quota/openam/openam-oauth2:6958-6972
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/openam/openam-oauth2:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/openam/openam-oauth2:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/openam/openam-oauth2:8747-8835
</span><span class="cx">/branches/OPENAM-4028-connection-pool/openam/openam-oauth2:9750-10171
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/openam/openam-oauth2:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/openam/openam-oauth2:7834-7844
</span><span class="cx">/branches/ame4272/openam/openam-oauth2:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/openam/openam-oauth2:7508-7697
</span><span class="cx">/branches/andyAme3102/openam/openam-oauth2:8312-8413
</span><span class="cx">/branches/maven_merge/openam/openam-oauth2:2556-2558,2756-3124
</span><span class="cx">/branches/oidc_authn/openam-oauth2:8507,8540,8557-8559,8565-8566
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/openam/openam-oauth2:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/openam/openam-oauth2:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/openam/openam-oauth2:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/openam/openam-oauth2:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/openam/openam-oauth2:6767-6804
</span><span class="cx">/branches/openam_10.1.0_SAML2_FIXES/openam-oauth2:3725-3740
</span><span class="cx">/branches/openam_10.1.0_jeff/openam-oauth2:3128-3527
</span><span class="cx">/branches/openam_10.1.0_xacml3_JAS/openam/openam-oauth2:4039-4140
</span><span class="cx">/branches/openam_10.2.0_xacml3_JAS/openam/openam-oauth2:4141-4379
</span><span class="cx">/branches/openid_connect_implementation/openam-oauth2:4140-5165
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/openam/openam-oauth2:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/openam/openam-oauth2:8476-8577
</span><span class="cx">/branches/pcunnington-oauth2/openam/openam-oauth2:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/openam/openam-oauth2:8314-8341
</span><span class="cx">/branches/rest_sts_view_bean/openam-oauth2:9690-9965
</span><span class="cx">/branches/rwapshott-AME-1739/openam/openam-oauth2:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/openam/openam-oauth2:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/openam/openam-oauth2:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/openam/openam-oauth2:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2027-cts-oids-should-follow-fr-oid-scheme/openam/openam-oauth2:5609-5614
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/openam/openam-oauth2:6086-6319
</span><span class="cx">/branches/rwapshott-ame-2311-index-names/openam/openam-oauth2:6058-6069
</span><span class="cx">/branches/rwapshott-ame-258-cts-replication/openam/openam-oauth2:5548-6055
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/openam/openam-oauth2:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/openam/openam-oauth2:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/openam/openam-oauth2:6170-6194
</span><span class="cx">/branches/rwapshott-openam-2729-saml2-error/openam/openam-oauth2:6247-6257
</span><span class="cx">/branches/sts_oidc_saml_redux/openam-oauth2:8417-8422,8424,8440,8445-8446,8460,8490,8498
</span><span class="cx">/branches/sts_restart_persistence/openam-oauth2:9003-9005,9009-9414
</span><span class="cx">/branches/sts_saml2_encrypt/openam-oauth2:10424-10472,10474-10550
</span><span class="cx">/branches/sts_service_listeners/openam-oauth2:9968-10031,10047-10048,10053
</span><span class="cx">/branches/sts_token_gen_service/openam-oauth2:8706,8717-8720, \
8723-8725,8727-8728,8731,8737,8740-8742,8759-8760,8774-8776,8796-8797,8800-8801,8818-8819,8821
</span><span class="cx">/branches/sts_token_gen_service2/openam-oauth2:8844-8887,8894-9000
</span><span class="cx">/branches/sts_x509/openam-oauth2:10206-10398
</span><span class="cx">/trunk/openam/openam-oauth2:3127-3577,10625,10631,10633,10638,10640,10643,10648,10784,10794
</span><a id="branchesAME4569XACMLResponseProviderSupportopenamopenamrestsrcmainjavaorgforgerockopenamforgerockrestIdentityResourceV1java"></a>
<div class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResourceV1.java</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-4460_AME-4459/openam/openam-forgerock-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResourceV1.java:10437-10535
</span><span class="cx">/branches/AME-4547/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResourceV1.java:10585-10783
</span><span class="cx">/branches/maven_merge/openam/openam-forgerock-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResource.java:3122-3124
</span><span class="cx">/trunk/openam/openam-forgerock-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResource.java:3125-10502
</span><span class="cx">/trunk/openam/openam-rest/src/main/java/org/forgerock/openam/ \
forgerockrest/IdentityResourceV1.java:10443-10567,10625,10631,10633,10638,10640,10643,10648,10784
</span><span class="cx"> + \
/branches/AME-4378/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResourceV1.java:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam/openam-forgerock-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResourceV1.java:10437-10535
</span><span class="cx">/branches/AME-4547/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResourceV1.java:10585-10783
</span><span class="cx">/branches/AME-4595/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResourceV1.java:10581-10789
</span><span class="cx">/branches/maven_merge/openam/openam-forgerock-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResource.java:3122-3124
</span><span class="cx">/trunk/openam/openam-forgerock-rest/src/main/java/org/forgerock/openam/forgerockrest/IdentityResource.java:3125-10502
</span><span class="cx">/trunk/openam/openam-rest/src/main/java/org/forgerock/openam/ \
forgerockrest/IdentityResourceV1.java:10443-10567,10625,10631,10633,10638,10640,10643,10648,10784,10794
</span><a id="branchesAME4569XACMLResponseProviderSupportopenamopenamrestsrctestjavaorgforgerockopenamforgerockrestentitlementsJsonPolicyParserTestjava"></a>
<div class="modfile"><h4>Modified: \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/entitlements/JsonPolicyParserTest.java \
(10807 => 10808)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4569-XACML-Response-Provider-Support/openam/openam-rest/src/test/java/org \
/forgerock/openam/forgerockrest/entitlements/JsonPolicyParserTest.java 2014-09-30 \
11:39:07 UTC (rev 10807)
+++ branches/AME-4569-XACML-Response-Provider-Support/openam/openam-rest/src/test/java \
/org/forgerock/openam/forgerockrest/entitlements/JsonPolicyParserTest.java 2014-09-30 \
11:44:08 UTC (rev 10808) </span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> import com.sun.identity.entitlement.Entitlement;
</span><span class="cx"> import com.sun.identity.entitlement.EntitlementCondition;
</span><span class="cx"> import com.sun.identity.entitlement.EntitlementException;
</span><del>-import com.sun.identity.entitlement.IPCondition;
</del><span class="cx"> import com.sun.identity.entitlement.NotCondition;
</span><span class="cx"> import com.sun.identity.entitlement.OrCondition;
</span><span class="cx"> import com.sun.identity.entitlement.Privilege;
</span><span class="lines">@@ -35,6 +34,8 @@
</span><span class="cx"> import com.sun.identity.shared.DateUtils;
</span><span class="cx"> import org.forgerock.json.fluent.JsonPointer;
</span><span class="cx"> import org.forgerock.json.fluent.JsonValue;
</span><ins>+import org.forgerock.openam.entitlement.conditions.environment.IPCondition;
+import org.forgerock.openam.entitlement.conditions.environment.OAuth2ScopeCondition;
</ins><span class="cx"> import org.forgerock.openam.utils.CollectionUtils;
</span><span class="cx"> import org.testng.annotations.AfterClass;
</span><span class="cx"> import org.testng.annotations.BeforeClass;
</span><span class="lines">@@ -294,20 +295,18 @@
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldCorrectlyParseConditionTypes() throws \
Exception { </span><span class="cx"> // Given
</span><del>- String startIp = "127.0.0.1";
- String endIp = "127.0.0.255";
</del><ins>+ String scope = "cn givenName";
</ins><span class="cx"> JsonValue content = \
json(object(field("condition", </span><del>- \
object(field("type", "IP"),
- field("startIp", startIp),
- field("endIp", endIp)))));
</del><ins>+ object(field("type", "OAuth2Scope"),
+ field("requiredScopes", array(scope))))));
</ins><span class="cx">
</span><span class="cx"> // When
</span><span class="cx"> Privilege result = parser.parsePolicy(POLICY_NAME, \
content); </span><span class="cx">
</span><span class="cx"> // Then
</span><del>- \
assertThat(result.getCondition()).isInstanceOf(IPCondition.class);
- assertThat(((IPCondition) \
result.getCondition()).getStartIp()).isEqualTo(startIp);
- assertThat(((IPCondition) \
result.getCondition()).getEndIp()).isEqualTo(endIp); </del><ins>+ \
assertThat(result.getCondition()).isInstanceOf(OAuth2ScopeCondition.class); + \
assertThat(((OAuth2ScopeCondition) result.getCondition()).getRequiredScopes()) + \
.isEqualTo(Collections.singleton(scope)); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @Test(expectedExceptions = EntitlementException.class)
</span><span class="lines">@@ -330,15 +329,13 @@
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldParseNestedAndConditions() throws \
Exception { </span><span class="cx"> // Given
</span><del>- // An AND condition containing a single IP condition
- String startIp = "127.0.0.1";
- String endIp = "127.0.0.255";
</del><ins>+ // An AND condition containing a single OAuth2Scope condition
+ String scope = "cn givenName";
</ins><span class="cx"> JsonValue content = \
json(object(field("condition", </span><span class="cx"> \
object(field("type", "AND"), </span><span class="cx"> \
field("conditions", </span><del>- \
Collections.singletonList(object(field("type", \
"IP"),
- field("startIp", startIp),
- field("endIp", endIp))))))));
</del><ins>+ \
Collections.singletonList(object(field("type", "OAuth2Scope"), + \
field("requiredScopes", array(scope))))))))); </ins><span class="cx">
</span><span class="cx"> // When
</span><span class="cx"> Privilege result = parser.parsePolicy(POLICY_NAME, \
content); </span><span class="lines">@@ -347,24 +344,21 @@
</span><span class="cx"> \
assertThat(result.getCondition()).isInstanceOf(AndCondition.class); </span><span \
class="cx"> AndCondition and = (AndCondition) result.getCondition(); \
</span><span class="cx"> assertThat(and.getEConditions()).hasSize(1); \
</span><del>- \
assertThat(and.getEConditions().iterator().next()).isInstanceOf(IPCondition.class);
- IPCondition ip = (IPCondition) and.getEConditions().iterator().next();
- assertThat(ip.getStartIp()).isEqualTo(startIp);
- assertThat(ip.getEndIp()).isEqualTo(endIp);
</del><ins>+ assertThat(and.getEConditions().iterator().next()).isInstanceOf(OAuth2ScopeCondition.class);
+ OAuth2ScopeCondition oauth2Scope = (OAuth2ScopeCondition) \
and.getEConditions().iterator().next(); + \
assertThat(oauth2Scope.getRequiredScopes()).isEqualTo(Collections.singleton(scope)); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldParseNestedOrConditions() throws \
Exception { </span><span class="cx"> // Given
</span><del>- // An OR condition containing a single IP condition
- String startIp = "127.0.0.1";
- String endIp = "127.0.0.255";
</del><ins>+ // An OR condition containing a single OAuth2Scope condition
+ String scope = "cn givenName";
</ins><span class="cx"> JsonValue content = \
json(object(field("condition", </span><span class="cx"> \
object(field("type", "OR"), </span><span class="cx"> \
field("conditions", </span><del>- \
Collections.singletonList(object(field("type", \
"IP"),
- field("startIp", startIp),
- field("endIp", endIp))))))));
</del><ins>+ \
Collections.singletonList(object(field("type", "OAuth2Scope"), + \
field("requiredScopes", array(scope))))))))); </ins><span class="cx">
</span><span class="cx"> // When
</span><span class="cx"> Privilege result = parser.parsePolicy(POLICY_NAME, \
content); </span><span class="lines">@@ -373,23 +367,20 @@
</span><span class="cx"> \
assertThat(result.getCondition()).isInstanceOf(OrCondition.class); </span><span \
class="cx"> OrCondition or = (OrCondition) result.getCondition(); \
</span><span class="cx"> assertThat(or.getEConditions()).hasSize(1); \
</span><del>- \
assertThat(or.getEConditions().iterator().next()).isInstanceOf(IPCondition.class);
- IPCondition ip = (IPCondition) or.getEConditions().iterator().next();
- assertThat(ip.getStartIp()).isEqualTo(startIp);
- assertThat(ip.getEndIp()).isEqualTo(endIp);
</del><ins>+ assertThat(or.getEConditions().iterator().next()).isInstanceOf(OAuth2ScopeCondition.class);
+ OAuth2ScopeCondition oauth2Scope = (OAuth2ScopeCondition) \
or.getEConditions().iterator().next(); + \
assertThat(oauth2Scope.getRequiredScopes()).isEqualTo(Collections.singleton(scope)); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void shouldParseNotConditions() throws Exception \
{ </span><span class="cx"> // Given
</span><del>- // A NOT condition containing an IP condition
- String startIp = "127.0.0.1";
- String endIp = "127.0.0.255";
</del><ins>+ // A NOT condition containing an OAuth2Scope condition
+ String scope = "cn givenName";
</ins><span class="cx"> JsonValue content = \
json(object(field("condition", </span><span class="cx"> \
object(field("type", "NOT"), </span><del>- \
field("condition", object(field("type", \
"IP"),
- field("startIp", startIp),
- field("endIp", endIp)))))));
</del><ins>+ field("condition", \
object(field("type", "OAuth2Scope"), + \
field("requiredScopes", array(scope)))))))); </ins><span class="cx">
</span><span class="cx"> // When
</span><span class="cx"> Privilege result = parser.parsePolicy(POLICY_NAME, \
content); </span><span class="lines">@@ -397,10 +388,9 @@
</span><span class="cx"> // Then
</span><span class="cx"> \
assertThat(result.getCondition()).isInstanceOf(NotCondition.class); </span><span \
class="cx"> NotCondition not = (NotCondition) result.getCondition(); \
</span><del>- \
assertThat(not.getECondition()).isInstanceOf(IPCondition.class);
- IPCondition ip = (IPCondition) not.getECondition();
- assertThat(ip.getStartIp()).isEqualTo(startIp);
- assertThat(ip.getEndIp()).isEqualTo(endIp);
</del><ins>+ assertThat(not.getECondition()).isInstanceOf(OAuth2ScopeCondition.class);
+ OAuth2ScopeCondition ip = (OAuth2ScopeCondition) not.getECondition();
+ assertThat(ip.getRequiredScopes()).isEqualTo(Collections.singleton(scope));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @Test
</span></span></pre></div>
<a id="branchesAME4569XACMLResponseProviderSupportopenamagents"></a>
<div class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support/openam-agents</h4> <pre \
class="diff"><span> </span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-2526-SFO-between-sites/openam-agents:7510-8258
</span><span class="cx">/branches/AME-3423/openam-agents:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/openam-agents:9534-9723
</span><span class="cx">/branches/AME-3719/openam-agents:9517-9879
</span><span class="cx">/branches/AME-4378/openam-agents:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam-agents:10437-10535
</span><span class="cx">/branches/AME-4547/openam-agents:10585-10783
</span><span class="cx">/branches/IIS7PostData/openam-agents:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/openam-agents:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/openam-agents:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/openam-agents:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/openam-agents:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/openam-agents:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/openam-agents:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/openam-agents:7834-7844
</span><span class="cx">/branches/ame4272/openam-agents:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/openam-agents:7508-7697
</span><span class="cx">/branches/andy-ame1316-connectionfactory/openam-agents:5311-5328
</span><span class="cx">/branches/andyOpenam1708/openam-agents:5576-5592
</span><span class="cx">/branches/andyOpenam2373/openam-agents:5600-5706
</span><span class="cx">/branches/apforrest-ame1316/openam-agents:4881-5305
</span><span class="cx">/branches/maven_merge/openam-agents:2556-3124
</span><span class="cx">/branches/mdr_javaagents_mvn/openam-agents:5293-5729
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/openam-agents:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/openam-agents:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/openam-agents:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/openam-agents:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/openam-agents:6767-6804
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/openam-agents:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/openam-agents:8476-8577
</span><span class="cx">/branches/pcunnington-AME-350/openam-agents:4165-4344
</span><span class="cx">/branches/pcunnington-ame-344/openam-agents:4651-5199
</span><span class="cx">/branches/pcunnington-oauth2/openam-agents:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/openam-agents:8314-8341
</span><span class="cx">/branches/policyimprovements/openam-agents:5513-5515
</span><span class="cx">/branches/rwapshott-AME-1739/openam-agents:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/openam-agents:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/openam-agents:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/openam-agents:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/openam-agents:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/openam-agents:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/openam-agents:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/openam-agents:6170-6194
</span><span class="cx">/trunk/openam-agents:10625,10631,10633,10638,10640,10643,10648,10784
</span><span class="cx"> + /branches/10.1.0-Xpress/openam-agents:3888-3892
</span><span class="cx">/branches/AME-2526-SFO-between-sites/openam-agents:7510-8258
</span><span class="cx">/branches/AME-3423/openam-agents:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/openam-agents:9534-9723
</span><span class="cx">/branches/AME-3719/openam-agents:9517-9879
</span><span class="cx">/branches/AME-4378/openam-agents:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/openam-agents:10437-10535
</span><span class="cx">/branches/AME-4547/openam-agents:10585-10783
</span><span class="cx">/branches/AME-4595/openam-agents:10581-10789
</span><span class="cx">/branches/IIS7PostData/openam-agents:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/openam-agents:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/openam-agents:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/openam-agents:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/openam-agents:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/openam-agents:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/openam-agents:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/openam-agents:7834-7844
</span><span class="cx">/branches/ame4272/openam-agents:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/openam-agents:7508-7697
</span><span class="cx">/branches/andy-ame1316-connectionfactory/openam-agents:5311-5328
</span><span class="cx">/branches/andyOpenam1708/openam-agents:5576-5592
</span><span class="cx">/branches/andyOpenam2373/openam-agents:5600-5706
</span><span class="cx">/branches/apforrest-ame1316/openam-agents:4881-5305
</span><span class="cx">/branches/maven_merge/openam-agents:2556-3124
</span><span class="cx">/branches/mdr_javaagents_mvn/openam-agents:5293-5729
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/openam-agents:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/openam-agents:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/openam-agents:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/openam-agents:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/openam-agents:6767-6804
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/openam-agents:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/openam-agents:8476-8577
</span><span class="cx">/branches/pcunnington-AME-350/openam-agents:4165-4344
</span><span class="cx">/branches/pcunnington-ame-344/openam-agents:4651-5199
</span><span class="cx">/branches/pcunnington-oauth2/openam-agents:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/openam-agents:8314-8341
</span><span class="cx">/branches/policyimprovements/openam-agents:5513-5515
</span><span class="cx">/branches/rwapshott-AME-1739/openam-agents:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/openam-agents:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/openam-agents:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/openam-agents:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/openam-agents:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/openam-agents:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/openam-agents:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/openam-agents:6170-6194
</span><span class="cx">/trunk/openam-agents:10625,10631,10633,10638,10640,10643,10648,10784,10794
</span><a id="branchesAME4569XACMLResponseProviderSupportopensso"></a>
<div class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support/opensso</h4> <pre \
class="diff"><span> </span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-3423/opensso:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/opensso:9534-9723
</span><span class="cx">/branches/AME-3719/opensso:9517-9879
</span><span class="cx">/branches/AME-4378/opensso:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/opensso:10437-10535
</span><span class="cx">/branches/AME-4547/opensso:10585-10783
</span><span class="cx">/branches/IIS7PostData/opensso:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/opensso:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/opensso:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/opensso:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/opensso:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/opensso:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/opensso:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/opensso:7834-7844
</span><span class="cx">/branches/allanCSDK:64-163
</span><span class="cx">/branches/ame4272/opensso:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/opensso:7508-7697
</span><span class="cx">/branches/maven_merge/opensso:2556-3124
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/opensso:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/opensso:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/opensso:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/opensso:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/opensso:6767-6804
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/opensso:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/opensso:8476-8577
</span><span class="cx">/branches/pcunnington-oauth2/opensso:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/opensso:8314-8341
</span><span class="cx">/branches/rwapshott-AME-1739/opensso:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/opensso:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/opensso:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/opensso:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/opensso:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/opensso:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/opensso:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/opensso:6170-6194
</span><span class="cx">/trunk/opensso:10625,10631,10633,10638,10640,10643,10648,10675,10687,10784
</span><span class="cx"> + /branches/AME-2526-SFO-between-sites/opensso:7510-8258
</span><span class="cx">/branches/AME-3423/opensso:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/opensso:9534-9723
</span><span class="cx">/branches/AME-3719/opensso:9517-9879
</span><span class="cx">/branches/AME-4378/opensso:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/opensso:10437-10535
</span><span class="cx">/branches/AME-4547/opensso:10585-10783
</span><span class="cx">/branches/AME-4595/opensso:10581-10789
</span><span class="cx">/branches/IIS7PostData/opensso:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/opensso:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/opensso:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/opensso:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/opensso:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/opensso:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/opensso:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/opensso:7834-7844
</span><span class="cx">/branches/allanCSDK:64-163
</span><span class="cx">/branches/ame4272/opensso:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/opensso:7508-7697
</span><span class="cx">/branches/maven_merge/opensso:2556-3124
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/opensso:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/opensso:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/opensso:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/opensso:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/opensso:6767-6804
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/opensso:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/opensso:8476-8577
</span><span class="cx">/branches/pcunnington-oauth2/opensso:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/opensso:8314-8341
</span><span class="cx">/branches/rwapshott-AME-1739/opensso:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/opensso:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/opensso:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/opensso:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/opensso:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/opensso:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/opensso:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/opensso:6170-6194
</span><span class="cx">/trunk/opensso:10625,10631,10633,10638,10640,10643,10648,10675,10687,10784,10794
</span><a id="branchesAME4569XACMLResponseProviderSupportopenssoproducts"></a>
<div class="propset"><h4>Property changes: \
branches/AME-4569-XACML-Response-Provider-Support/opensso/products</h4> <pre \
class="diff"><span> </span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/AME-3423/opensso/products:10105-10414
</span><span class="cx">/branches/AME-3612-pcunnington/opensso/products:9534-9723
</span><span class="cx">/branches/AME-3719/opensso/products:9517-9879
</span><span class="cx">/branches/AME-4378/opensso/products:10443-10621
</span><span class="cx">/branches/AME-4460_AME-4459/opensso/products:10437-10535
</span><span class="cx">/branches/AME-4547/opensso/products:10585-10783
</span><span class="cx">/branches/IIS7PostData/opensso/products:224-261
</span><span class="cx">/branches/OPENAM-2961-forgot-password-404/opensso/products:8322-8362
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/opensso/products:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/opensso/products:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/opensso/products:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/opensso/products:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/opensso/products:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/opensso/products:7834-7844
</span><span class="cx">/branches/ame4272/opensso/products:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/opensso/products:7508-7697
</span><span class="cx">/branches/j2eePostData/opensso/products:482-520
</span><span class="cx">/branches/maven_merge/opensso/products:2556-3124
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/opensso/products:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/opensso/products:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/opensso/products:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/opensso/products:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/opensso/products:6767-6804
</span><span class="cx">/branches/opends23_build002/products:132-181
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/opensso/products:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/opensso/products:8476-8577
</span><span class="cx">/branches/pcunnington-oauth2/opensso/products:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/opensso/products:8314-8341
</span><span class="cx">/branches/rwapshott-AME-1739/opensso/products:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/opensso/products:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/opensso/products:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/opensso/products:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/opensso/products:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/opensso/products:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/opensso/products:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/opensso/products:6170-6194
</span><span class="cx">/trunk/opensso/products:10625,10631,10633,10638,10640,10643,10648,10675,10687,10784
</span><span class="cx"> + \
/branches/AME-2526-SFO-between-sites/opensso/products:7510-8258 </span><span \
class="cx">/branches/AME-3423/opensso/products:10105-10414 </span><span \
class="cx">/branches/AME-3612-pcunnington/opensso/products:9534-9723 </span><span \
class="cx">/branches/AME-3719/opensso/products:9517-9879 </span><span \
class="cx">/branches/AME-4378/opensso/products:10443-10621 </span><span \
class="cx">/branches/AME-4460_AME-4459/opensso/products:10437-10535 </span><span \
class="cx">/branches/AME-4547/opensso/products:10585-10783 </span><span \
class="cx">/branches/AME-4595/opensso/products:10581-10789 </span><span \
class="cx">/branches/IIS7PostData/opensso/products:224-261 </span><span \
class="cx">/branches/OPENAM-2961-forgot-password-404/opensso/products:8322-8362 \
</span><span class="cx">/branches/OPENAM-3097-sessions-not-deleted/opensso/products:6910-6946
</span><span class="cx">/branches/OPENAM-3283-CTS-thread-exceptions/opensso/products:7270-7369
</span><span class="cx">/branches/OPENAM-3425-class-cast-exception/opensso/products:8333-8359
</span><span class="cx">/branches/OPENAM-3782-forgotten-password-changes/opensso/products:8747-8835
</span><span class="cx">/branches/OPENAM-4384-ssoadm-classpath/opensso/products:10263-10264
</span><span class="cx">/branches/OPENAM-OPENAM-3528-client-side-session-validation/opensso/products:7834-7844
</span><span class="cx">/branches/ame4272/opensso/products:10073-10101
</span><span class="cx">/branches/andy-ame-2227-v2/opensso/products:7508-7697
</span><span class="cx">/branches/j2eePostData/opensso/products:482-520
</span><span class="cx">/branches/maven_merge/opensso/products:2556-3124
</span><span class="cx">/branches/openam-3049-cts-reaper-connection-usage/opensso/products:6658-6745
</span><span class="cx">/branches/openam-3053-cts-tab-exception/opensso/products:6672-6721
</span><span class="cx">/branches/openam-3072-cts-configuration/opensso/products:6691-6714
</span><span class="cx">/branches/openam-3092-store-mode-error/opensso/products:6729-6733
</span><span class="cx">/branches/openam-3110-create-or-update-bug/opensso/products:6767-6804
</span><span class="cx">/branches/opends23_build002/products:132-181
</span><span class="cx">/branches/pcunnington-AME-3115-refactor/opensso/products:8348-8473
</span><span class="cx">/branches/pcunnington-AME-3158/opensso/products:8476-8577
</span><span class="cx">/branches/pcunnington-oauth2/opensso/products:8710-8793
</span><span class="cx">/branches/phcunnington-AME-3114/opensso/products:8314-8341
</span><span class="cx">/branches/rwapshott-AME-1739/opensso/products:5331-5353
</span><span class="cx">/branches/rwapshott-AME-215/opensso/products:4091-4155
</span><span class="cx">/branches/rwapshott-AME-257/opensso/products:4047-4126
</span><span class="cx">/branches/rwapshott-AME-804/opensso/products:4267-5404
</span><span class="cx">/branches/rwapshott-ame-2160-session-size/opensso/products:6086-6319
</span><span class="cx">/branches/rwapshott-openam-2198-session-resource-protection/opensso/products:5628-5824
</span><span class="cx">/branches/rwapshott-openam-2526/opensso/products:5442-5484
</span><span class="cx">/branches/rwapshott-openam-2716-cts-invalid-chars/opensso/products:6170-6194
</span><span class="cx">/trunk/opensso/products:10625,10631,10633,10638,10640,10643,10648,10675,10687,10784,10794
</span></div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
CommitOpenAM mailing list
CommitOpenAM@forgerock.org
https://lists.forgerock.org/mailman/listinfo/commitopenam
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic