[prev in list] [next in list] [prev in thread] [next in thread] 

List:       forgerock-openam-commit
Subject:    [CommitOpenAM] [10799] branches/AME-4609: AME-4609 Merge of origin branch AME-4616 in to this branch
From:       noreply () forgerock ! org
Date:       2014-09-30 9:53:33
Message-ID: 20140930095333.1A39340934 () 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>[10799] branches/AME-4609: AME-4609 Merge of origin branch AME-4616 in to this \
branch.</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=10799">10799</a></dd> \
<dt>Author</dt> <dd>craig.mcdonnell</dd> <dt>Date</dt> <dd>2014-09-30 10:53:32 +0100 \
(Tue, 30 Sep 2014)</dd> </dl>

<h3>Log Message</h3>
<pre>AME-4609 Merge of origin branch AME-4616 in to this branch.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesAME4609openamopenamcoresrcmainjavacomsunidentityentitlementxacml \
3XACMLPrivilegeUtilsjava">branches/AME-4609/openam/openam-core/src/main/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtils.java</a></li>
 <li><a href="#branchesAME4609openamopenamentitlementssrcmainjavacomsunidentityentitle \
mentPrivilegeManagerjava">branches/AME-4609/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/PrivilegeManager.java</a></li>
 <li><a href="#branchesAME4609openamopenamentitlementssrcmainjavacomsunidentityentitle \
mentReferralPrivilegeManagerjava">branches/AME-4609/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/ReferralPrivilegeManager.java</a></li>
 <li><a href="#branchesAME4609openamopenamrestsrcmainjavaorgforgerockopenamforgerockre \
stutilsXMLResourceExceptionHandlerjava">branches/AME-4609/openam/openam-rest/src/main/ \
java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandler.java</a></li>
 <li><a href="#branchesAME4609openamopenamrestsrctestjavaorgforgerockopenamforgerockre \
stutilsXMLResourceExceptionHandlerTestjava">branches/AME-4609/openam/openam-rest/src/t \
est/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandlerTest.java</a></li>
 </ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branchesAME4609">branches/AME-4609/</a></li>
<li><a href="#branchesAME4609openam">branches/AME-4609/openam/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesAME4609"></a>
<div class="propset"><h4>Property changes: branches/AME-4609</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-4616:10678-10781
</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:10652-10780
</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-4616:10678-10792
</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:10652-10780
</span><a id="branchesAME4609openam"></a>
<div class="propset"><h4>Property changes: branches/AME-4609/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-4616/openam:10678-10781
</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:10652-10780
</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-4616/openam:10678-10792
</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:10652-10780
</span><a id="branchesAME4609openamopenamcoresrcmainjavacomsunidentityentitlementxacml3XACMLPrivilegeUtilsjava"></a>
 <div class="modfile"><h4>Modified: \
branches/AME-4609/openam/openam-core/src/main/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtils.java \
(10798 => 10799)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4609/openam/openam-core/src/main/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtils.java	2014-09-30 \
                09:51:01 UTC (rev 10798)
+++ branches/AME-4609/openam/openam-core/src/main/java/com/sun/identity/entitlement/xacml3/XACMLPrivilegeUtils.java	2014-09-30 \
09:53:32 UTC (rev 10799) </span><span class="lines">@@ -774,31 +774,20 @@
</span><span class="cx">         return privileges;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    public static Privilege policyToPrivilege(Policy policy)
-            throws EntitlementException {
</del><ins>+    public static Privilege policyToPrivilege(Policy policy) throws \
EntitlementException { </ins><span class="cx"> 
</span><span class="cx">         String policyId = policy.getPolicyId();
</span><span class="cx">         String privilegeName = \
policyIdToPrivilegeName(policyId); </span><span class="cx">         String \
description = policy.getDescription(); </span><span class="cx"> 
</span><del>-        String createdBy = getVariableById(policy,
-                XACMLConstants.PRIVILEGE_CREATED_BY);
</del><ins>+        String createdBy = getVariableById(policy, \
XACMLConstants.PRIVILEGE_CREATED_BY); +        long createdAt = \
dateStringToLong(getVariableById(policy, XACMLConstants.PRIVILEGE_CREATION_DATE)); +  \
String lastModifiedBy = getVariableById(policy, \
XACMLConstants.PRIVILEGE_LAST_MODIFIED_BY); +        long lastModifiedAt = \
dateStringToLong(getVariableById(policy, \
XACMLConstants.PRIVILEGE_LAST_MODIFIED_DATE)); </ins><span class="cx"> 
</span><del>-        long createdAt = dateStringToLong(getVariableById(policy,
-                XACMLConstants.PRIVILEGE_CREATION_DATE));
</del><ins>+        String entitlementName = getVariableById(policy, \
XACMLConstants.ENTITLEMENT_NAME); +        String applicationName = \
getVariableById(policy, XACMLConstants.APPLICATION_NAME); </ins><span class="cx"> 
</span><del>-        String lastModifiedBy = getVariableById(policy,
-                XACMLConstants.PRIVILEGE_LAST_MODIFIED_BY);
-
-        long lastModifiedAt = dateStringToLong(getVariableById(policy,
-                XACMLConstants.PRIVILEGE_LAST_MODIFIED_DATE));
-
-        String entitlementName = getVariableById(policy,
-                XACMLConstants.ENTITLEMENT_NAME);
-
-        String applicationName = getVariableById(policy,
-                XACMLConstants.APPLICATION_NAME);
-
</del><span class="cx">         List&lt;Match&gt; policyMatches = \
getAllMatchesFromTarget(policy.getTarget()); </span><span class="cx">         \
Set&lt;String&gt; resourceNames = getResourceNamesFromMatches(policyMatches); \
</span><span class="cx">         Set&lt;String&gt; excludedResourceNames = \
getExcludedResourceNamesFromMatches(policyMatches); </span><span class="lines">@@ \
-1477,32 +1466,23 @@ </span><span class="cx">         return \
XACMLConstants.XS_BOOLEAN_TRUE.equalsIgnoreCase(s); </span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    public static ReferralPrivilege policyToReferral(Policy policy)
-            throws EntitlementException, JSONException {
</del><ins>+    public static ReferralPrivilege policyToReferral(Policy policy) \
throws EntitlementException, JSONException { +
</ins><span class="cx">         String policyId = policy.getPolicyId();
</span><span class="cx">         String privilegeName = \
policyIdToPrivilegeName(policyId); </span><span class="cx">         String \
description = policy.getDescription(); </span><span class="cx"> 
</span><del>-        String createdBy = getVariableById(policy,
-                XACMLConstants.PRIVILEGE_CREATED_BY);
</del><ins>+        String createdBy = getVariableById(policy, \
XACMLConstants.PRIVILEGE_CREATED_BY); +        long createdAt = \
dateStringToLong(getVariableById(policy, XACMLConstants.PRIVILEGE_CREATION_DATE)); +  \
String lastModifiedBy = getVariableById(policy, \
XACMLConstants.PRIVILEGE_LAST_MODIFIED_BY); +        long lastModifiedAt = \
dateStringToLong(getVariableById(policy, \
XACMLConstants.PRIVILEGE_LAST_MODIFIED_DATE)); </ins><span class="cx"> 
</span><del>-        long createdAt = dateStringToLong(getVariableById(policy,
-                XACMLConstants.PRIVILEGE_CREATION_DATE));
-
-        String lastModifiedBy = getVariableById(policy,
-                XACMLConstants.PRIVILEGE_LAST_MODIFIED_BY);
-
-        long lastModifiedAt = dateStringToLong(getVariableById(policy,
-                XACMLConstants.PRIVILEGE_LAST_MODIFIED_DATE));
-
</del><span class="cx">         List&lt;Match&gt; policyMatches = \
getAllMatchesFromTarget(policy.getTarget()); </span><span class="cx">         \
JSONObject jo = getRealmsAppsResources(policyMatches); </span><span class="cx"> 
</span><span class="cx">         Set&lt;String&gt; realms = JSONUtils.getSet(jo, \
&quot;realms&quot;); </span><del>-        Map&lt;String, Set&lt;String&gt;&gt; \
                appsResources
-                = JSONUtils.getMapStringSetString(jo, &quot;appsResources&quot;);
-        ReferralPrivilege  referral = new ReferralPrivilege(privilegeName,
-                appsResources, realms);
</del><ins>+        Map&lt;String, Set&lt;String&gt;&gt; appsResources = \
JSONUtils.getMapStringSetString(jo, &quot;appsResources&quot;); +        \
ReferralPrivilege referral = new ReferralPrivilege(privilegeName, appsResources, \
realms); </ins><span class="cx">         referral.setCreatedBy(createdBy);
</span><span class="cx">         referral.setCreationDate(createdAt);
</span><span class="cx">         referral.setLastModifiedBy(lastModifiedBy);
</span></span></pre></div>
<a id="branchesAME4609openamopenamentitlementssrcmainjavacomsunidentityentitlementPrivilegeManagerjava"></a>
 <div class="modfile"><h4>Modified: \
branches/AME-4609/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/PrivilegeManager.java \
(10798 => 10799)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4609/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/PrivilegeManager.java	2014-09-30 \
                09:51:01 UTC (rev 10798)
+++ branches/AME-4609/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/PrivilegeManager.java	2014-09-30 \
09:53:32 UTC (rev 10799) </span><span class="lines">@@ -118,9 +118,8 @@
</span><span class="cx">      */
</span><span class="cx">     @Override
</span><span class="cx">     public boolean canFindByName(String name) throws \
EntitlementException { </span><del>-        // TODO: Optimise LDAP query since only a \
count is required? </del><span class="cx">         SearchFilter filter = new \
SearchFilter(&quot;name&quot;, name); </span><del>-        return \
search(asSet(filter)).isEmpty(); </del><ins>+        return \
searchNames(asSet(filter)).isEmpty(); </ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     protected void validate(Privilege privilege) throws \
EntitlementException { </span></span></pre></div>
<a id="branchesAME4609openamopenamentitlementssrcmainjavacomsunidentityentitlementReferralPrivilegeManagerjava"></a>
 <div class="modfile"><h4>Modified: \
branches/AME-4609/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/ReferralPrivilegeManager.java \
(10798 => 10799)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4609/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/ReferralPrivilegeManager.java	2014-09-30 \
                09:51:01 UTC (rev 10798)
+++ branches/AME-4609/openam/openam-entitlements/src/main/java/com/sun/identity/entitlement/ReferralPrivilegeManager.java	2014-09-30 \
09:53:32 UTC (rev 10799) </span><span class="lines">@@ -156,7 +156,6 @@
</span><span class="cx">      */
</span><span class="cx">     @Override
</span><span class="cx">     public boolean canFindByName(String name) throws \
EntitlementException { </span><del>-        // TODO: Optimise LDAP query since only a \
count is required? </del><span class="cx">         SearchFilter filter = new \
SearchFilter(&quot;name&quot;, name); </span><span class="cx">         return \
searchNames(asSet(filter)).isEmpty(); </span><span class="cx">     }
</span></span></pre></div>
<a id="branchesAME4609openamopenamrestsrcmainjavaorgforgerockopenamforgerockrestutilsXMLResourceExceptionHandlerjava"></a>
 <div class="modfile"><h4>Modified: \
branches/AME-4609/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandler.java \
(10798 => 10799)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4609/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandler.java	2014-09-30 \
                09:51:01 UTC (rev 10798)
+++ branches/AME-4609/openam/openam-rest/src/main/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandler.java	2014-09-30 \
09:53:32 UTC (rev 10799) </span><span class="lines">@@ -17,15 +17,14 @@
</span><span class="cx"> package org.forgerock.openam.forgerockrest.utils;
</span><span class="cx"> 
</span><span class="cx"> import com.sun.identity.shared.xml.XMLUtils;
</span><ins>+import org.forgerock.guava.common.net.MediaType;
</ins><span class="cx"> import org.forgerock.jaspi.runtime.ResourceExceptionHandler;
</span><span class="cx"> import org.forgerock.json.fluent.JsonValue;
</span><span class="cx"> import org.forgerock.json.resource.ResourceException;
</span><span class="cx"> import org.w3c.dom.Document;
</span><span class="cx"> import org.w3c.dom.Element;
</span><span class="cx"> 
</span><del>-import javax.servlet.http.HttpServletRequest;
</del><span class="cx"> import javax.servlet.http.HttpServletResponse;
</span><del>-import javax.ws.rs.core.MediaType;
</del><span class="cx"> import javax.xml.parsers.ParserConfigurationException;
</span><span class="cx"> import javax.xml.transform.Transformer;
</span><span class="cx"> import javax.xml.transform.TransformerException;
</span><span class="lines">@@ -33,40 +32,30 @@
</span><span class="cx"> import javax.xml.transform.dom.DOMSource;
</span><span class="cx"> import javax.xml.transform.stream.StreamResult;
</span><span class="cx"> import java.io.IOException;
</span><ins>+import java.util.Arrays;
</ins><span class="cx"> import java.util.Collection;
</span><ins>+import java.util.List;
</ins><span class="cx"> import java.util.Map;
</span><del>-import java.util.regex.Pattern;
</del><span class="cx"> 
</span><span class="cx"> public class XMLResourceExceptionHandler implements \
ResourceExceptionHandler { </span><span class="cx"> 
</span><del>-    private static final Pattern APPLICATION_XML_TYPE = \
                Pattern.compile(&quot;^application/([a-zA-Z0-9]+\\+)?xml&quot;);
-    private static final String TEXT_XML_TYPE = MediaType.TEXT_XML;
</del><ins>+    private static final List&lt;MediaType&gt; HANDLES = Arrays.asList(
+            MediaType.XML_UTF_8.withoutParameters(), \
MediaType.APPLICATION_XML_UTF_8.withoutParameters()); </ins><span class="cx"> 
</span><span class="cx">     /**
</span><span class="cx">      * {@inheritDoc}
</span><span class="cx">      * @return {@code true} if the {@code Accept} header, or \
if it is missing, if the {@code Content-Type} header, is </span><span class="cx">     \
* {@code text/xml} or {@code application/xml}. </span><span class="cx">      */
</span><del>-    public boolean canHandle(HttpServletRequest request) {
-        String acceptHeader = request.getHeader(&quot;Accept&quot;);
-        if (acceptHeader != null) {
-            return isXmlType(acceptHeader);
-        }
-        return isXmlType(request.getHeader(&quot;Content-Type&quot;));
</del><ins>+    public Collection&lt;MediaType&gt; handles() {
+        return HANDLES;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    private boolean isXmlType(String header) {
-        if (header == null) {
-            return false;
-        }
-        return APPLICATION_XML_TYPE.matcher(header).matches() || \
                header.startsWith(TEXT_XML_TYPE);
-    }
-
</del><span class="cx">     /**
</span><span class="cx">      * {@inheritDoc}
</span><span class="cx">      */
</span><span class="cx">     public void write(ResourceException e, \
HttpServletResponse response) throws IOException { </span><del>-        \
response.setContentType(MediaType.APPLICATION_XML); </del><ins>+        \
response.setContentType(&quot;application/xml&quot;); </ins><span class="cx">         \
TransformerFactory tf = TransformerFactory.newInstance(); </span><span class="cx">    \
try { </span><span class="cx">             Transformer transformer = \
tf.newTransformer(); </span></span></pre></div>
<a id="branchesAME4609openamopenamrestsrctestjavaorgforgerockopenamforgerockrestutilsXMLResourceExceptionHandlerTestjava"></a>
 <div class="modfile"><h4>Modified: \
branches/AME-4609/openam/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandlerTest.java \
(10798 => 10799)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/AME-4609/openam/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandlerTest.java	2014-09-30 \
                09:51:01 UTC (rev 10798)
+++ branches/AME-4609/openam/openam-rest/src/test/java/org/forgerock/openam/forgerockrest/utils/XMLResourceExceptionHandlerTest.java	2014-09-30 \
09:53:32 UTC (rev 10799) </span><span class="lines">@@ -19,19 +19,12 @@
</span><span class="cx"> import com.sun.identity.shared.xml.XMLUtils;
</span><span class="cx"> import org.forgerock.json.fluent.JsonValue;
</span><span class="cx"> import org.forgerock.json.resource.ResourceException;
</span><del>-import org.testng.annotations.DataProvider;
</del><span class="cx"> import org.testng.annotations.Test;
</span><del>-import org.w3c.dom.Document;
</del><span class="cx"> 
</span><del>-import javax.servlet.http.HttpServletRequest;
</del><span class="cx"> import javax.servlet.http.HttpServletResponse;
</span><del>-import javax.ws.rs.core.MediaType;
-
</del><span class="cx"> import java.io.PrintWriter;
</span><span class="cx"> import java.io.StringWriter;
</span><span class="cx"> import java.util.AbstractMap;
</span><del>-import java.util.HashMap;
-import java.util.Map;
</del><span class="cx"> 
</span><span class="cx"> import static org.fest.assertions.Assertions.*;
</span><span class="cx"> import static org.mockito.Mockito.*;
</span><span class="lines">@@ -40,35 +33,6 @@
</span><span class="cx"> 
</span><span class="cx">     private XMLResourceExceptionHandler handler = new \
XMLResourceExceptionHandler(); </span><span class="cx"> 
</span><del>-    @DataProvider(name = &quot;content-types&quot;)
-    public static Object[][] contentTypes() {
-        return new Object[][] {
-                { MediaType.APPLICATION_XML, null, true },
-                { MediaType.APPLICATION_SVG_XML, null, true },
-                { MediaType.TEXT_XML, null, true },
-                { MediaType.TEXT_PLAIN, null, false },
-                { null, MediaType.APPLICATION_XML, true },
-                { null, MediaType.APPLICATION_SVG_XML, true },
-                { null, MediaType.TEXT_XML, true },
-                { null, MediaType.TEXT_PLAIN, false },
-                { null, null, false }
-        };
-    }
-
-    @Test(dataProvider = &quot;content-types&quot;)
-    public void testCanHandle(String accept, String contentType, Boolean canHandle) \
                throws Exception {
-        //given
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        doReturn(accept).when(request).getHeader(&quot;Accept&quot;);
-        doReturn(contentType).when(request).getHeader(&quot;Content-Type&quot;);
-
-        //when
-        Boolean result = handler.canHandle(request);
-
-        //then
-        assertThat(result).isEqualTo(canHandle);
-    }
-
</del><span class="cx">     @Test
</span><span class="cx">     public void testWrite() throws Exception {
</span><span class="cx">         //given
</span><span class="lines">@@ -82,7 +46,7 @@
</span><span class="cx">         handler.write(ex, response);
</span><span class="cx"> 
</span><span class="cx">         //then
</span><del>-        verify(response).setContentType(MediaType.APPLICATION_XML);
</del><ins>+        verify(response).setContentType(&quot;application/xml&quot;);
</ins><span class="cx">         String text = writer.getBuffer().toString();
</span><span class="cx">         assertThat(text).contains(&quot;&lt;message&gt;I \
don't know where it is&lt;/message&gt;&quot;); </span><span class="cx">         \
assertThat(text).contains(&quot;&lt;code&gt;404&lt;/code&gt;&quot;); \
</span></span></pre> </div>
</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