You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/01/18 16:51:51 UTC
cxf-fediz git commit: Fixing a bug when choosing the home realm
Repository: cxf-fediz
Updated Branches:
refs/heads/master bf5783b5a -> 889916470
Fixing a bug when choosing the home realm
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/88991647
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/88991647
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/88991647
Branch: refs/heads/master
Commit: 8899164702f284966088c13f740bc0ad88561062
Parents: bf5783b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jan 18 16:51:39 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jan 18 16:51:39 2017 +0000
----------------------------------------------------------------------
.../cxf/fediz/service/idp/model/TrustedIDPSelection.java | 10 +++++-----
.../idp/src/main/webapp/WEB-INF/flows/signin-request.xml | 4 ++--
services/idp/src/main/webapp/WEB-INF/views/idplist.jsp | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/88991647/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/TrustedIDPSelection.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/TrustedIDPSelection.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/TrustedIDPSelection.java
index 6498f29..44cb3a2 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/TrustedIDPSelection.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/TrustedIDPSelection.java
@@ -24,13 +24,13 @@ public class TrustedIDPSelection implements Serializable {
private static final long serialVersionUID = 1L;
- private String whr;
+ private String homeRealm;
- public String getWhr() {
- return whr;
+ public String getHomeRealm() {
+ return homeRealm;
}
- public void setWhr(String whr) {
- this.whr = whr;
+ public void setHomeRealm(String homeRealm) {
+ this.homeRealm = homeRealm;
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/88991647/services/idp/src/main/webapp/WEB-INF/flows/signin-request.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/flows/signin-request.xml b/services/idp/src/main/webapp/WEB-INF/flows/signin-request.xml
index d618c76..2a7b125 100644
--- a/services/idp/src/main/webapp/WEB-INF/flows/signin-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/flows/signin-request.xml
@@ -59,14 +59,14 @@
<var name="trustedIDPSelection"
class="org.apache.cxf.fediz.service.idp.model.TrustedIDPSelection" />
<binder>
- <binding property="home_realm" required="true" />
+ <binding property="homeRealm" required="true" />
</binder>
<on-entry>
<set name="requestScope.idPConfig" value="flowScope.idpConfig" />
</on-entry>
<transition on="submit" to="checkIsThisIDP" bind="true"
validate="true">
- <set name="flowScope.home_realm" value="trustedIDPSelection.home_realm" />
+ <set name="flowScope.home_realm" value="trustedIDPSelection.homeRealm" />
<evaluate
expression="homeRealmReminder.addCookie(flowRequestContext, flowScope.home_realm)" />
</transition>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/88991647/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp b/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
index a6aa358..0a9cdb1 100644
--- a/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
+++ b/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
@@ -15,7 +15,7 @@
<br />
<% Idp idp = (Idp)request.getAttribute("idpConfig");
List<TrustedIdp> trustedIDPs = idp.getTrustedIdps(); %>
- <select name="whr">
+ <select name="homeRealm">
<% if (idp.isUseCurrentIdp()) { %>
<option value="<%=idp.getRealm()%>" selected="selected" ><%=idp.getServiceDescription()%></option>
<% }