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

List:       forgerock-openam-commit
Subject:    [CommitOpenAM] [13640] branches/soap_sts_x509: getting rid of the x509 'transport' binding
From:       noreply () forgerock ! org
Date:       2015-04-29 17:51:32
Message-ID: 20150429175132.8461F3FA1E () 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>[13640] branches/soap_sts_x509: getting rid of the x509 'transport' \
binding</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=13640">13640</a></dd> \
<dt>Author</dt> <dd>dhogan</dd> <dt>Date</dt> <dd>2015-04-29 18:51:32 +0100 (Wed, 29 \
Apr 2015)</dd> </dl>

<h3>Log Message</h3>
<pre>getting rid of the x509 'transport' binding</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessoap_sts_x509openamserveronlysrcmainresourcesservicessoapSTSxml" \
>branches/soap_sts_x509/openam-server-only/src/main/resources/services/soapSTS.xml</a></li>
> 
<li><a href="#branchessoap_sts_x509openamstsopenamclientstssrcmainjavaorgforgerockopen \
amstsAMSTSConstantsjava">branches/soap_sts_x509/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/AMSTSConstants.java</a></li>
 <li><a href="#branchessoap_sts_x509openamstsopenamclientstssrcmainjavaorgforgerockope \
namstssoapconfiguserSoapSTSInstanceConfigjava">branches/soap_sts_x509/openam-sts/opena \
m-client-sts/src/main/java/org/forgerock/openam/sts/soap/config/user/SoapSTSInstanceConfig.java</a></li>
 <li><a href="#branchessoap_sts_x509openamstsopenamclientstssrctestjavaorgforgerockope \
namstssoapconfiguserSoapSTSInstanceConfigTestjava">branches/soap_sts_x509/openam-sts/o \
penam-client-sts/src/test/java/org/forgerock/openam/sts/soap/config/user/SoapSTSInstanceConfigTest.java</a></li>
 <li><a href="#branchessoap_sts_x509openamstsopenamsoapstsopenamsoapstsclientsrcmainja \
vaorgforgerockopenamstssoapEndpointSpecificationjava">branches/soap_sts_x509/openam-st \
s/openam-soap-sts/openam-soap-sts-client/src/main/java/org/forgerock/openam/sts/soap/EndpointSpecification.java</a></li>
 </ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessoap_sts_x509openamstsopenamsoapstsopenamsoapstsserversrcmainres \
ourcessts_x509_transportwsdl">branches/soap_sts_x509/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/resources/sts_x509_transport.wsdl</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessoap_sts_x509openamserveronlysrcmainresourcesservicessoapSTSxml"></a>
<div class="modfile"><h4>Modified: \
branches/soap_sts_x509/openam-server-only/src/main/resources/services/soapSTS.xml \
(13639 => 13640)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/soap_sts_x509/openam-server-only/src/main/resources/services/soapSTS.xml	2015-04-29 \
                17:40:07 UTC (rev 13639)
+++ branches/soap_sts_x509/openam-server-only/src/main/resources/services/soapSTS.xml	2015-04-29 \
17:51:32 UTC (rev 13640) </span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;am_transport_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}am_transport_sts_service&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;x509_asymmetric_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_asymmetric_sts_service&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;x509_symmetric_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_symmetric_sts_service&lt;/ChoiceValue&gt;
 </span><del>-                        &lt;ChoiceValue \
i18nKey=&quot;x509_transport_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_transport_sts_service&lt;/ChoiceValue&gt;
 </del><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;am_bare_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}am_bare_sts_service&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;custom_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}custom_service_name&lt;/ChoiceValue&gt;
 </span><span class="cx">                     &lt;/ChoiceValues&gt;
</span><span class="lines">@@ -83,7 +82,6 @@
</span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;am_transport_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}am_transport_sts_service_port&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;x509_asymmetric_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_asymmetric_sts_service_port&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;x509_symmetric_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_symmetric_sts_service_port&lt;/ChoiceValue&gt;
 </span><del>-                        &lt;ChoiceValue \
i18nKey=&quot;x509_transport_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_transport_sts_service_port&lt;/ChoiceValue&gt;
 </del><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;am_bare_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}am_bare_sts_service_port&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;custom_service_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}custom_service_port&lt;/ChoiceValue&gt;
 </span><span class="cx">                     &lt;/ChoiceValues&gt;
</span><span class="lines">@@ -102,9 +100,8 @@
</span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;ut_asymmetric_wsdl&quot;&gt;sts_ut_asymmetric.wsdl&lt;/ChoiceValue&gt; \
</span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;openam_transport_wsdl&quot;&gt;sts_am_transport.wsdl&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;openam_bare_wsdl&quot;&gt;sts_am_bare.wsdl&lt;/ChoiceValue&gt; \
</span><del>-                        &lt;ChoiceValue \
                i18nKey=&quot;x509&quot;&gt;sts_x509_asymmetric.wsdl&lt;/ChoiceValue&gt;
                
-                        &lt;ChoiceValue \
                i18nKey=&quot;x509&quot;&gt;sts_x509_symmetric.wsdl&lt;/ChoiceValue&gt;
                
-                        &lt;ChoiceValue \
i18nKey=&quot;x509&quot;&gt;sts_x509_transport.wsdl&lt;/ChoiceValue&gt; </del><ins>+  \
&lt;ChoiceValue i18nKey=&quot;x509_asymmetric_wsdl&quot;&gt;sts_x509_asymmetric.wsdl&lt;/ChoiceValue&gt;
 +                        &lt;ChoiceValue \
i18nKey=&quot;x509_symmetric_wsdl&quot;&gt;sts_x509_symmetric.wsdl&lt;/ChoiceValue&gt;
 </ins><span class="cx">                         &lt;ChoiceValue \
i18nKey=&quot;custom_wsdl_file&quot;&gt;custom_wsdl_file&lt;/ChoiceValue&gt; \
</span><span class="cx">                     &lt;/ChoiceValues&gt; </span><span \
class="cx">                 &lt;/AttributeSchema&gt; </span><span class="lines">@@ \
-308,7 +305,6 @@ </span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;am_transport_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}am_transport_sts_service&lt;/ChoiceValue&gt;
 </span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;x509_asymmetric_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_asymmetric_sts_service&lt;/ChoiceValue&gt;
 </span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;x509_symmetric_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_symmetric_sts_service&lt;/ChoiceValue&gt;
 </span><del>-                            &lt;ChoiceValue \
i18nKey=&quot;x509_transport_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_transport_sts_service&lt;/ChoiceValue&gt;
 </del><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;am_bare_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}am_bare_sts_service&lt;/ChoiceValue&gt;
 </span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;custom_service_name&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}custom_service_name&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;/ChoiceValues&gt;
</span><span class="lines">@@ -328,7 +324,6 @@
</span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;am_transport_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}am_transport_sts_service_port&lt;/ChoiceValue&gt;
 </span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;x509_asymmetric_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_asymmetric_sts_service_port&lt;/ChoiceValue&gt;
 </span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;x509_symmetric_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_symmetric_sts_service_port&lt;/ChoiceValue&gt;
 </span><del>-                            &lt;ChoiceValue \
i18nKey=&quot;x509_transport_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}x509_transport_sts_service_port&lt;/ChoiceValue&gt;
 </del><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;am_bare_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}am_bare_sts_service_port&lt;/ChoiceValue&gt;
 </span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;custom_service_port&quot;&gt;{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}custom_service_port&lt;/ChoiceValue&gt;
 </span><span class="cx">                         &lt;/ChoiceValues&gt;
</span><span class="lines">@@ -347,9 +342,8 @@
</span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;ut_asymmetric_wsdl&quot;&gt;sts_ut_asymmetric.wsdl&lt;/ChoiceValue&gt; \
</span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;openam_transport_wsdl&quot;&gt;sts_am_transport.wsdl&lt;/ChoiceValue&gt;
 </span><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;openam_bare_wsdl&quot;&gt;sts_am_bare.wsdl&lt;/ChoiceValue&gt; \
</span><del>-                            &lt;ChoiceValue \
                i18nKey=&quot;x509&quot;&gt;sts_x509_asymmetric.wsdl&lt;/ChoiceValue&gt;
                
-                            &lt;ChoiceValue \
                i18nKey=&quot;x509&quot;&gt;sts_x509_symmetric.wsdl&lt;/ChoiceValue&gt;
                
-                            &lt;ChoiceValue \
i18nKey=&quot;x509&quot;&gt;sts_x509_transport.wsdl&lt;/ChoiceValue&gt; </del><ins>+  \
&lt;ChoiceValue i18nKey=&quot;x509_asymmetric_wsdl&quot;&gt;sts_x509_asymmetric.wsdl&lt;/ChoiceValue&gt;
 +                            &lt;ChoiceValue \
i18nKey=&quot;x509_symmetric_wsdl&quot;&gt;sts_x509_symmetric.wsdl&lt;/ChoiceValue&gt;
 </ins><span class="cx">                             &lt;ChoiceValue \
i18nKey=&quot;custom_wsdl_file&quot;&gt;custom_wsdl_file&lt;/ChoiceValue&gt; \
</span><span class="cx">                         &lt;/ChoiceValues&gt; </span><span \
class="cx">                     &lt;/AttributeSchema&gt; </span></span></pre></div>
<a id="branchessoap_sts_x509openamstsopenamclientstssrcmainjavaorgforgerockopenamstsAMSTSConstantsjava"></a>
 <div class="modfile"><h4>Modified: \
branches/soap_sts_x509/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/AMSTSConstants.java \
(13639 => 13640)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/soap_sts_x509/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/AMSTSConstants.java	2015-04-29 \
                17:40:07 UTC (rev 13639)
+++ branches/soap_sts_x509/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/AMSTSConstants.java	2015-04-29 \
17:51:32 UTC (rev 13640) </span><span class="lines">@@ -53,8 +53,7 @@
</span><span class="cx">     public static final QName \
X509_ASYMMETRIC_STS_SERVICE_PORT = new QName(WS_TRUST_NAMESPACE, \
&quot;x509_asymmetric_sts_service_port&quot;); </span><span class="cx">     public \
static final QName X509_SYMMETRIC_STS_SERVICE = new QName(WS_TRUST_NAMESPACE, \
&quot;x509_symmetric_sts_service&quot;); </span><span class="cx">     public static \
final QName X509_SYMMETRIC_STS_SERVICE_PORT = new QName(WS_TRUST_NAMESPACE, \
&quot;x509_symmetric_sts_service_port&quot;); </span><del>-    public static final \
QName X509_TRANSPORT_STS_SERVICE = new QName(WS_TRUST_NAMESPACE, \
                &quot;x509_transport_sts_service&quot;);
-    public static final QName X509_TRANSPORT_STS_SERVICE_PORT = new \
QName(WS_TRUST_NAMESPACE, &quot;x509_transport_sts_service_port&quot;); </del><ins>+
</ins><span class="cx">     /*
</span><span class="cx">     Used in conjunction with com.google.inject.Names.named \
to distinguish e.g. a Provider of the token types for </span><span class="cx">     \
issue operations vs. the token types for validate operations. In each case a \
list&lt;TokenType&gt; is returned, and thus </span></span></pre></div>
<a id="branchessoap_sts_x509openamstsopenamclientstssrcmainjavaorgforgerockopenamstssoapconfiguserSoapSTSInstanceConfigjava"></a>
 <div class="modfile"><h4>Modified: \
branches/soap_sts_x509/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/soap/config/user/SoapSTSInstanceConfig.java \
(13639 => 13640)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/soap_sts_x509/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/soap/config/user/SoapSTSInstanceConfig.java	2015-04-29 \
                17:40:07 UTC (rev 13639)
+++ branches/soap_sts_x509/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/soap/config/user/SoapSTSInstanceConfig.java	2015-04-29 \
17:51:32 UTC (rev 13640) </span><span class="lines">@@ -213,8 +213,7 @@
</span><span class="cx">      */
</span><span class="cx">     private boolean stsClientsAssertedViaX509() {
</span><span class="cx">         final QName serviceName = \
deploymentConfig.getService(); </span><del>-        return \
(AMSTSConstants.X509_ASYMMETRIC_STS_SERVICE.equals(serviceName) || \
                AMSTSConstants.X509_SYMMETRIC_STS_SERVICE.equals(serviceName) ||
-            AMSTSConstants.X509_TRANSPORT_STS_SERVICE.equals(serviceName));
</del><ins>+        return \
(AMSTSConstants.X509_ASYMMETRIC_STS_SERVICE.equals(serviceName) || \
AMSTSConstants.X509_SYMMETRIC_STS_SERVICE.equals(serviceName)); </ins><span \
class="cx">     } </span><span class="cx"> 
</span><span class="cx">     private boolean x509TokenValidatorPresent() {
</span></span></pre></div>
<a id="branchessoap_sts_x509openamstsopenamclientstssrctestjavaorgforgerockopenamstssoapconfiguserSoapSTSInstanceConfigTestjava"></a>
 <div class="modfile"><h4>Modified: \
branches/soap_sts_x509/openam-sts/openam-client-sts/src/test/java/org/forgerock/openam/sts/soap/config/user/SoapSTSInstanceConfigTest.java \
(13639 => 13640)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/soap_sts_x509/openam-sts/openam-client-sts/src/test/java/org/forgerock/openam/sts/soap/config/user/SoapSTSInstanceConfigTest.java	2015-04-29 \
                17:40:07 UTC (rev 13639)
+++ branches/soap_sts_x509/openam-sts/openam-client-sts/src/test/java/org/forgerock/openam/sts/soap/config/user/SoapSTSInstanceConfigTest.java	2015-04-29 \
17:51:32 UTC (rev 13640) </span><span class="lines">@@ -293,10 +293,8 @@
</span><span class="cx"> 
</span><span class="cx">         \
assertTrue(fileContent.contains(AMSTSConstants.X509_ASYMMETRIC_STS_SERVICE.toString()));
 </span><span class="cx">         \
assertTrue(fileContent.contains(AMSTSConstants.X509_SYMMETRIC_STS_SERVICE.toString()));
 </span><del>-        \
assertTrue(fileContent.contains(AMSTSConstants.X509_TRANSPORT_STS_SERVICE.toString()));
 </del><span class="cx">         \
assertTrue(fileContent.contains(AMSTSConstants.X509_ASYMMETRIC_STS_SERVICE_PORT.toString()));
 </span><span class="cx">         \
assertTrue(fileContent.contains(AMSTSConstants.X509_SYMMETRIC_STS_SERVICE_PORT.toString()));
 </span><del>-        \
assertTrue(fileContent.contains(AMSTSConstants.X509_TRANSPORT_STS_SERVICE_PORT.toString()));
 </del><span class="cx"> 
</span><span class="cx">         \
assertTrue(fileContent.contains(AMSTSConstants.AM_TRANSPORT_STS_SERVICE.toString())); \
</span><span class="cx">         \
assertTrue(fileContent.contains(AMSTSConstants.AM_TRANSPORT_STS_SERVICE_PORT.toString()));
 </span></span></pre></div>
<a id="branchessoap_sts_x509openamstsopenamsoapstsopenamsoapstsclientsrcmainjavaorgforgerockopenamstssoapEndpointSpecificationjava"></a>
 <div class="modfile"><h4>Modified: \
branches/soap_sts_x509/openam-sts/openam-soap-sts/openam-soap-sts-client/src/main/java/org/forgerock/openam/sts/soap/EndpointSpecification.java \
(13639 => 13640)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/soap_sts_x509/openam-sts/openam-soap-sts/openam-soap-sts-client/src/main/java/org/forgerock/openam/sts/soap/EndpointSpecification.java	2015-04-29 \
                17:40:07 UTC (rev 13639)
+++ branches/soap_sts_x509/openam-sts/openam-soap-sts/openam-soap-sts-client/src/main/java/org/forgerock/openam/sts/soap/EndpointSpecification.java	2015-04-29 \
17:51:32 UTC (rev 13640) </span><span class="lines">@@ -105,16 +105,6 @@
</span><span class="cx">                 AMSTSConstants.X509_ASYMMETRIC_STS_SERVICE);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    /**
-     * @return an EndpointSpecification instance specifying service and port QNames \
                corresponding to a 'two-way' TLS
-     * binding - i.e. TLS where the client must present their certificate.
-     */
-    public static EndpointSpecification x509Transport() {
-        return new EndpointSpecification(
-                AMSTSConstants.X509_TRANSPORT_STS_SERVICE_PORT,
-                AMSTSConstants.X509_TRANSPORT_STS_SERVICE);
-    }
-
</del><span class="cx">     @Override
</span><span class="cx">     public boolean equals(Object other) {
</span><span class="cx">         if (this ==  other) {
</span></span></pre></div>
<a id="branchessoap_sts_x509openamstsopenamsoapstsopenamsoapstsserversrcmainresourcessts_x509_transportwsdl"></a>
 <div class="delfile"><h4>Deleted: \
branches/soap_sts_x509/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/resources/sts_x509_transport.wsdl \
(13639 => 13640)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/soap_sts_x509/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/resources/sts_x509_transport.wsdl	2015-04-29 \
                17:40:07 UTC (rev 13639)
+++ branches/soap_sts_x509/openam-sts/openam-soap-sts/openam-soap-sts-server/src/main/resources/sts_x509_transport.wsdl	2015-04-29 \
17:51:32 UTC (rev 13640) </span><span class="lines">@@ -1,128 +0,0 @@
</span><del>-&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;!--
- * The contents of this file are subject to the terms of the Common Development and
- * Distribution License (the License). You may not use this file except in \
                compliance with the
- * License.
- *
- * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for \
                the
- * specific language governing permission and limitations under the License.
- *
- * When distributing Covered Software, include this CDDL Header Notice in each file \
                and include
- * the License file at legal/CDDLv1.0.txt. If applicable, add the following below \
                the CDDL
- * Header, with the fields enclosed by brackets [] replaced by your own identifying
- * information: &quot;Portions Copyrighted [year] [name of copyright owner]&quot;.
- *
- * Copyright 2015 ForgeRock AS.
---&gt;
-&lt;wsdl:definitions
-        targetNamespace=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/&quot;
                
-        xmlns:tns=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/&quot;
-        xmlns:wstrust=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/&quot;
-        xmlns:wsdl=&quot;http://schemas.xmlsoap.org/wsdl/&quot;
-        xmlns:soap=&quot;http://schemas.xmlsoap.org/wsdl/soap/&quot;
-        xmlns:wsu=&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd&quot;
                
-        xmlns:wsp=&quot;http://www.w3.org/ns/ws-policy&quot;
-        xmlns:sp=&quot;http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702&quot;&gt;
                
-
-    &lt;wsdl:import \
location=&quot;ws-trust-1.4-service.wsdl&quot;	namespace=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/&quot;/&gt;
                
-
-    &lt;wsdl:binding name=&quot;x509_token_transport_binding&quot; \
                type=&quot;wstrust:STS&quot;&gt;
-        &lt;wsp:PolicyReference URI=&quot;#x509_token_transport_policy&quot; /&gt;
-        &lt;soap:binding style=&quot;document&quot;
-                      transport=&quot;http://schemas.xmlsoap.org/soap/http&quot; \
                /&gt;
-        &lt;wsdl:operation name=&quot;Issue&quot;&gt;
-            &lt;soap:operation
-                    \
soapAction=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue&quot; \
                /&gt;
-            &lt;wsdl:input&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:input&gt;
-            &lt;wsdl:output&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:output&gt;
-        &lt;/wsdl:operation&gt;
-        &lt;wsdl:operation name=&quot;Validate&quot;&gt;
-            &lt;soap:operation
-                    \
soapAction=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate&quot; \
                /&gt;
-            &lt;wsdl:input&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:input&gt;
-            &lt;wsdl:output&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:output&gt;
-        &lt;/wsdl:operation&gt;
-        &lt;wsdl:operation name=&quot;Cancel&quot;&gt;
-            &lt;soap:operation
-                    \
soapAction=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel&quot; \
                /&gt;
-            &lt;wsdl:input&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:input&gt;
-            &lt;wsdl:output&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:output&gt;
-        &lt;/wsdl:operation&gt;
-        &lt;wsdl:operation name=&quot;Renew&quot;&gt;
-            &lt;soap:operation
-                    \
soapAction=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew&quot; \
                /&gt;
-            &lt;wsdl:input&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:input&gt;
-            &lt;wsdl:output&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:output&gt;
-        &lt;/wsdl:operation&gt;
-        &lt;wsdl:operation name=&quot;KeyExchangeToken&quot;&gt;
-            &lt;soap:operation
-                    \
soapAction=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken&quot; \
                /&gt;
-            &lt;wsdl:input&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:input&gt;
-            &lt;wsdl:output&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:output&gt;
-        &lt;/wsdl:operation&gt;
-        &lt;wsdl:operation name=&quot;RequestCollection&quot;&gt;
-            &lt;soap:operation
-                    \
soapAction=&quot;http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection&quot; \
                /&gt;
-            &lt;wsdl:input&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:input&gt;
-            &lt;wsdl:output&gt;
-                &lt;soap:body use=&quot;literal&quot; /&gt;
-            &lt;/wsdl:output&gt;
-        &lt;/wsdl:operation&gt;
-    &lt;/wsdl:binding&gt;
-
-    &lt;wsp:Policy wsu:Id=&quot;x509_token_transport_policy&quot;&gt;
-        &lt;sp:TransportBinding&gt;
-            &lt;wsp:Policy&gt;
-                &lt;sp:TransportToken&gt;
-                    &lt;wsp:Policy&gt;
-                        &lt;sp:HttpsToken&gt;
-                            &lt;wsp:Policy&gt;
-                                &lt;sp:RequireClientCertificate /&gt;
-                            &lt;/wsp:Policy&gt;
-                        &lt;/sp:HttpsToken&gt;
-                    &lt;/wsp:Policy&gt;
-                &lt;/sp:TransportToken&gt;
-                &lt;sp:AlgorithmSuite&gt;
-                    &lt;wsp:Policy&gt;
-                        &lt;sp:Basic128 /&gt;
-                    &lt;/wsp:Policy&gt;
-                &lt;/sp:AlgorithmSuite&gt;
-                &lt;sp:Layout&gt;
-                    &lt;wsp:Policy&gt;
-                        &lt;sp:Strict /&gt;
-                    &lt;/wsp:Policy&gt;
-                &lt;/sp:Layout&gt;
-                &lt;sp:IncludeTimestamp /&gt;
-            &lt;/wsp:Policy&gt;
-        &lt;/sp:TransportBinding&gt;
-    &lt;/wsp:Policy&gt;
-
-    &lt;wsdl:service name=&quot;x509_transport_sts_service&quot;&gt;
-        &lt;wsdl:port name=&quot;x509_transport_sts_service_port&quot; \
                binding=&quot;tns:x509_token_transport_binding&quot;&gt;
-            &lt;soap:address location=&quot;&quot;/&gt;
-        &lt;/wsdl:port&gt;
-    &lt;/wsdl:service&gt;
-&lt;/wsdl:definitions&gt;
-
</del></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