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/11 21:13:42 UTC
[1/2] cxf-fediz git commit: Add the OIDC war + source to the
distribution
Repository: cxf-fediz
Updated Branches:
refs/heads/master e106d24ec -> d65d3978e
Add the OIDC war + source to the distribution
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/82f7a57a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/82f7a57a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/82f7a57a
Branch: refs/heads/master
Commit: 82f7a57ae96ad5676e58c8a36bb9e5a812a925ca
Parents: e106d24
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Apr 11 17:02:10 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Apr 11 17:02:10 2016 +0100
----------------------------------------------------------------------
apache-fediz/pom.xml | 6 ++++++
apache-fediz/src/assembly/bin.xml | 13 +++++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/82f7a57a/apache-fediz/pom.xml
----------------------------------------------------------------------
diff --git a/apache-fediz/pom.xml b/apache-fediz/pom.xml
index 0f5c5a1..223d05c 100644
--- a/apache-fediz/pom.xml
+++ b/apache-fediz/pom.xml
@@ -48,6 +48,12 @@
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz</groupId>
+ <artifactId>fediz-oidc</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.fediz</groupId>
<artifactId>fediz-core</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/82f7a57a/apache-fediz/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/apache-fediz/src/assembly/bin.xml b/apache-fediz/src/assembly/bin.xml
index ce446df..14d992c 100644
--- a/apache-fediz/src/assembly/bin.xml
+++ b/apache-fediz/src/assembly/bin.xml
@@ -93,6 +93,18 @@
</excludes>
</fileSet>
<fileSet>
+ <directory>../services/oidc</directory>
+ <outputDirectory>apache-fediz-${project.version}/idp/src/oidc</outputDirectory>
+ <excludes>
+ <exclude>**/build</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/build/**/*</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/interopfest/**</exclude>
+ <exclude>**/.*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
<directory>../</directory>
<outputDirectory>apache-fediz-${project.version}</outputDirectory>
<includes>
@@ -108,6 +120,7 @@
<includes>
<include>org.apache.cxf.fediz:fediz-idp</include>
<include>org.apache.cxf.fediz:fediz-idp-sts</include>
+ <include>org.apache.cxf.fediz:fediz-oidc</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<scope>runtime</scope>
[2/2] cxf-fediz git commit: Fix for failing to load the validation
key after an initial failure
Posted by co...@apache.org.
Fix for failing to load the validation key after an initial failure
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d65d3978
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d65d3978
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d65d3978
Branch: refs/heads/master
Commit: d65d3978e46c81fb79997f58bcca8528baf3c6f9
Parents: 82f7a57
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Apr 11 17:18:36 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Apr 11 17:18:36 2016 +0100
----------------------------------------------------------------------
.../org/apache/cxf/fediz/core/config/FedizContext.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d65d3978/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
index d67d49b..123d463 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
@@ -26,6 +26,7 @@ import java.math.BigInteger;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -63,7 +64,7 @@ public class FedizContext implements Closeable {
private String relativePath;
private ReplayCache replayCache;
private Protocol protocol;
- private List<TrustManager> certificateStores;
+ private List<TrustManager> certificateStores = new ArrayList<>();
private KeyManager keyManager;
private KeyManager decryptionKeyManager;
private ClassLoader classloader;
@@ -97,10 +98,10 @@ public class FedizContext implements Closeable {
}
public List<TrustManager> getCertificateStores() {
- if (certificateStores != null) {
- return certificateStores;
+ if (!certificateStores.isEmpty()) {
+ return Collections.unmodifiableList(certificateStores);
}
- certificateStores = new ArrayList<>();
+
CertificateStores certStores = config.getCertificateStores();
List<TrustManagersType> trustManagers = certStores.getTrustManager();
for (TrustManagersType manager : trustManagers) {
@@ -126,7 +127,7 @@ public class FedizContext implements Closeable {
throw new RuntimeException("Failed to read keystore");
}
}
- return certificateStores;
+ return Collections.unmodifiableList(certificateStores);
}
public BigInteger getMaximumClockSkew() {