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 2015/05/05 16:30:08 UTC
[2/3] cxf-fediz git commit: Fixing build again
Fixing build again
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9a8c751d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9a8c751d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9a8c751d
Branch: refs/heads/master
Commit: 9a8c751d29eeacbe5f02b5b6f2af03f85cf334f7
Parents: 77e537f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue May 5 14:48:14 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue May 5 15:29:52 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java | 3 ++-
.../cxf/fediz/integrationtests/AbstractClientCertTests.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9a8c751d/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
index c318c86..40c93c0 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.cxf.fediz.service.idp.domain.Application;
import org.apache.cxf.fediz.service.idp.domain.Idp;
+import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
public class IDPConfig extends Idp {
@@ -33,6 +34,6 @@ public class IDPConfig extends Idp {
}
public void setTrustedIDPs(Map<String, TrustedIDPConfig> trustedIDPs) {
- this.trustedIdpList = new ArrayList<>(trustedIDPs.values());
+ this.trustedIdpList = new ArrayList<TrustedIdp>(trustedIDPs.values());
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9a8c751d/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
----------------------------------------------------------------------
diff --git a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
index cbb9c85..1a5fe6c 100644
--- a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
+++ b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractClientCertTests.java
@@ -155,7 +155,7 @@ public abstract class AbstractClientCertTests {
WebRequest request = new WebRequest(new URL(url), HttpMethod.POST);
- request.setRequestParameters(new ArrayList<>());
+ request.setRequestParameters(new ArrayList<NameValuePair>());
request.getRequestParameters().add(new NameValuePair("wctx", wctx));
request.getRequestParameters().add(new NameValuePair("wa", wa));
request.getRequestParameters().add(new NameValuePair("wtrealm", wtrealm));