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 2016/04/13 18:09:53 UTC
cxf-fediz git commit: Fixing backmerge
Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes 7fb519c25 -> 54fc13679
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/54fc1367
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/54fc1367
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/54fc1367
Branch: refs/heads/1.2.x-fixes
Commit: 54fc13679c6ceaa43144937354e7ad36a6d8cc7c
Parents: 7fb519c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 13 17:09:46 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 13 17:09:46 2016 +0100
----------------------------------------------------------------------
.../idp/src/main/webapp/WEB-INF/federation-validate-request.xml | 2 +-
.../src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/54fc1367/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
index 62dd5b9..114bb5d 100644
--- a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
@@ -36,7 +36,7 @@
<set name="flowScope.SAMLResponse" value="requestParameters.SAMLResponse" />
<evaluate expression="requestScope.getString('wauth','default')"
result="flowScope.wauth" />
- <set name="flowScope.idpConfig" value="config.getIDP(fedizEntryPoint.getRealm())" />
+ <set name="flowScope.idpConfig" value="config.getIDP(federationEntryPoint.getRealm())" />
</on-entry>
<if
test="requestParameters.wa == 'wsignout1.0' or requestParameters.wa == 'wsignoutcleanup1.0'"
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/54fc1367/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
----------------------------------------------------------------------
diff --git a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
index a6b1e4e..5998bcf 100644
--- a/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
+++ b/systests/idp/src/test/java/org/apache/cxf/fediz/systests/idp/IdpTest.java
@@ -253,8 +253,6 @@ public class IdpTest {
}
Assert.assertNotNull(wresult);
-
- webClient.close();
}
@Test