cxf git commit: CXF-7276: Atmosphere init code should be moved out of AtmosphereWebSocketServlet Destination

2017-04-11 Thread reta 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 73f8c955d -> bf6ef93b0


CXF-7276: Atmosphere init code should be moved out of 
AtmosphereWebSocketServlet Destination


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bf6ef93b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf6ef93b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf6ef93b

Branch: refs/heads/3.1.x-fixes
Commit: bf6ef93b02520a4d860049bbc1cf142212cba9b1
Parents: 73f8c95
Author: reta 
Authored: Wed Apr 5 08:33:20 2017 -0400
Committer: reta 
Committed: Tue Apr 11 18:13:54 2017 -0400

--
 .../samples/jax_rs/websocket_web/pom.xml|  1 -
 .../transport/http/DestinationRegistryImpl.java | 15 +++-
 .../transport/servlet/AbstractHTTPServlet.java  |  4 +-
 .../transport/servlet/CXFNonSpringServlet.java  |  9 +++
 .../transport/servlet/ServletConfigAware.java   | 30 
 .../transport/servlet/ServletDestination.java   | 11 ++-
 .../AtmosphereWebSocketServletDestination.java  | 78 
 7 files changed, 129 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bf6ef93b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 9cc66f8..91ec9dc 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -118,6 +118,5 @@
 atmosphere-runtime
 ${cxf.atmosphere.version}
 
-
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/bf6ef93b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
index 78f0803..cfec4bd 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
@@ -30,10 +30,14 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
 import org.apache.cxf.service.model.InterfaceInfo;
 import org.apache.cxf.transport.AbstractDestination;
+import org.apache.cxf.transport.servlet.ServletConfigAware;
 
-public class DestinationRegistryImpl implements DestinationRegistry {
+public class DestinationRegistryImpl implements DestinationRegistry, 
ServletConfigAware {
 private static final String SLASH = "/";
 private ConcurrentMap destinations 
 = new ConcurrentHashMap();
@@ -170,5 +174,14 @@ public class DestinationRegistryImpl implements 
DestinationRegistry {
 }
 return path;
 }
+
+@Override
+public void onServletConfigAvailable(ServletConfig config) throws 
ServletException {
+for (final AbstractHTTPDestination destination: getDestinations()) {
+if (destination instanceof ServletConfigAware) {
+
((ServletConfigAware)destination).onServletConfigAvailable(config);
+}
+}
+}
 
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/bf6ef93b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index d013bdf..01b95f2 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -123,8 +123,8 @@ public abstract class AbstractHTTPServlet extends 
HttpServlet implements Filter
 public void destroy() {
 FileUtils.maybeDeleteDefaultTempDir();
 }
-
-protected void finalizeServletInit(ServletConfig servletConfig) {
+
+protected void finalizeServletInit(ServletConfig servletConfig) throws 
ServletException {
 InputStream is = getResourceAsStream("/WEB-INF" + 
STATIC_RESOURCES_MAP_RESOURCE);
 if (is == null) {
 is =

cxf-fediz git commit: Fixing failing tests

2017-04-11 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 5aaa18f9c -> 23cf2feeb


Fixing failing tests


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/23cf2fee
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/23cf2fee
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/23cf2fee

Branch: refs/heads/master
Commit: 23cf2feebcdaf80b58fad051a581a3f69a8fde33
Parents: 5aaa18f
Author: Colm O hEigeartaigh 
Authored: Tue Apr 11 18:23:51 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Apr 11 18:23:51 2017 +0100

--
 .../samlsso/src/test/resources/realmb/security-config.xml | 3 +++
 .../wsfed/src/test/resources/realmb/security-config.xml   | 3 +++
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/23cf2fee/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
--
diff --git 
a/systests/federation/samlsso/src/test/resources/realmb/security-config.xml 
b/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
index d206024..866d2e9 100644
--- a/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
+++ b/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
@@ -122,6 +122,9 @@
 
 
 
+
+

 
 https://localhost:0/fediz-idp-sts-realmb/${realm.STS_URI}/STSServiceTransportUT?wsdl"/>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/23cf2fee/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
--
diff --git 
a/systests/federation/wsfed/src/test/resources/realmb/security-config.xml 
b/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
index d206024..866d2e9 100644
--- a/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
+++ b/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
@@ -122,6 +122,9 @@
 
 
 
+
+

 
 https://localhost:0/fediz-idp-sts-realmb/${realm.STS_URI}/STSServiceTransportUT?wsdl"/>

[1/2] cxf git commit: Recording .gitmergeinfo Changes

2017-04-11 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes f7407e1ea -> 73f8c955d


Recording .gitmergeinfo Changes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/73f8c955
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/73f8c955
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/73f8c955

Branch: refs/heads/3.1.x-fixes
Commit: 73f8c955d8f593928b1f00586043e14daf5d5242
Parents: e8ee2cc
Author: Daniel Kulp 
Authored: Tue Apr 11 12:24:04 2017 -0400
Committer: Daniel Kulp 
Committed: Tue Apr 11 12:24:04 2017 -0400

--
 .gitmergeinfo | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/73f8c955/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0f5029e..2e4926a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -170,6 +170,7 @@ B 7eb2d58faacb2dd57c1eddea99c59a8b17807faf
 B 7f4a24d037c06f76770e969ad7e2a47f4687a33a
 B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
 B 7fcd84b1f82a203917a5269a2c0c10a0d5b6f877
+B 811daf375e496e42ac9002aaf59f1eb2c1301942
 B 8172db9fcfd3472731fdd9e26704bcdd7f63cd76
 B 85c397f853c6b7ca0ed6d924445d6173962e1ec4
 B 86251ae75e6a663d6419623f47e393dd7a042742
@@ -225,6 +226,7 @@ B afdf9361f1c3ce49c8440a5f2615bde2bb42c684
 B b2c10cc6c18a6e6589d258436303c46b3f682f7e
 B b3ec59efcd10cf64a1bb8a399082071905f5baa9
 B b667f5b29b97a96985bd3d2b9d63b2d3d2d7c27e
+B b6a4763dc95c874004e600c7796474f267b8
 B b7cd2fb4b883cf9f6972d3593ecb0e1d31be7245
 B b8132e5962e326355b699bca445afe9274d0f91d
 B bacef091c2152d51ebdefbe20244e73d1c26b39d
@@ -351,6 +353,7 @@ M 08c9194ce2c567ebfe59f59ee628b1197d90fd43
 M 090fa6100ae3a5aa8ae894b0e238acb793f705ec
 M 09fb22b25333c66514f06652ceaf7fc11bde51cc
 M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
+M 0eef86f37288f71fd96506fb2ac7fa27169d1e43
 M 10d34e1a812ab2a709376f008c738de68c8720cf
 M 10ed38c6d1f74f75ae231e8b91b7198b4e162ab3
 M 11637433df089a638e173d1ef57441e7456cf2ea
@@ -372,6 +375,7 @@ M 1afeea8bdc0ef96df1d52ea343957dc396723f8c
 M 1e57d379863d01b9330fff797c14d81a56b0b0f2
 M 20d0a2811c15cb65a402eb063e1359236d7014ea
 M 21031e3ab2ae227540e2a078d0336d894361acba
+M 2519863ca4d11ca1b6f3ac74361f3eaba3918690
 M 2538ae42fb0c774023deed5264291b2fe6658cb8
 M 26edcd457ea507075a4c82e2787f11f11a432876
 M 29af9d48cee34521fcc9bc27a79d15f5781916a9
@@ -432,6 +436,7 @@ M 7476fc331f00a01851b5fbb66758818bef8ba2c4
 M 74a5139520ac289d3a6d93da14573ef7501b8d1d
 M 74b8db2dcc5fc60a513d9e73e258aeba99727a39
 M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81
+M 7aa8ebf5450c0a399e86fe5d50865fcd22849f63
 M 7ace8c84cff4696e365800fbba12cc789e97971f
 M 7c3a8b02a62db3bcc5c3a1895e9f30bc4fa3821a
 M 7dbb31aed4bfa28bd170d6170d76ba4d7f43e7de
@@ -448,6 +453,7 @@ M 8583a24ac541dc373503d7a6c59cd90890acdae3
 M 86667619dc61c8a84672fc5a583b4517f48176c5
 M 896f1abec915897967905762d6e850cfb6bac3bc
 M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
+M 8b78d8c82accc1f0beca55eef8d5bce87c7af792
 M 8c6401b76ca76010e7e169656fd2f5fae6f3245a
 M 8dadf3defb43d13169943b191204be93da63c88b
 M 8e131133c8566a124605cb06e0b6db98fddb5972

[2/2] cxf git commit: [CXF-5407] Implement a full remove method for CacheMap

2017-04-11 Thread dkulp 
[CXF-5407] Implement a full remove method for CacheMap


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e8ee2cc5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e8ee2cc5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e8ee2cc5

Branch: refs/heads/3.1.x-fixes
Commit: e8ee2cc5d2d530f38bbe29297015a67d3c97ecf5
Parents: f7407e1e
Author: Daniel Kulp 
Authored: Tue Apr 11 12:22:57 2017 -0400
Committer: Daniel Kulp 
Committed: Tue Apr 11 12:24:04 2017 -0400

--
 .../org/apache/cxf/common/util/CacheMap.java| 10 
 .../apache/cxf/common/util/CacheMapTest.java| 50 
 2 files changed, 60 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e8ee2cc5/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java 
b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
index 4f0a98c..15b6963 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
@@ -19,6 +19,7 @@
 package org.apache.cxf.common.util;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
@@ -119,7 +120,16 @@ public class CacheMap implements Map {
 
 public V remove(Object key) {
 V v = mainDataMap.remove(key);
+Set keys = new HashSet<>(extraKeyMap.keySet());
 V v2 = extraKeyMap.remove(key);
+for (K nk : keys) {
+if (key.equals(nk)) {
+V v3 = extraKeyMap.remove(nk);
+if (v2 == null) {
+v2 = v3;
+}
+}
+}
 return v == null ? v2 : v;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e8ee2cc5/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
--
diff --git a/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java 
b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
new file mode 100644
index 000..cdec8e4
--- /dev/null
+++ b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.common.util;
+
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+/**
+ * 
+ */
+public class CacheMapTest {
+
+@Test
+public void testRemove() {
+Map definitions = new CacheMap();
+
+Object putValue = new Object();
+
+String putKey = "test";
+definitions.put(putKey, putValue);
+
+String removeKey = new String("test");
+Object removeValue = definitions.remove(removeKey);
+
+Assert.assertEquals(putKey, removeKey);
+Assert.assertEquals(putValue, removeValue);
+Assert.assertTrue(definitions.isEmpty());
+}
+
+}

cxf git commit: [CXF-5407] Implement a full remove method for CacheMap

2017-04-11 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/master 811daf375 -> 156fd30dc


[CXF-5407] Implement a full remove method for CacheMap


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/156fd30d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/156fd30d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/156fd30d

Branch: refs/heads/master
Commit: 156fd30dcc8880969817473fe5fe027884988822
Parents: 811daf3
Author: Daniel Kulp 
Authored: Tue Apr 11 12:22:57 2017 -0400
Committer: Daniel Kulp 
Committed: Tue Apr 11 12:22:57 2017 -0400

--
 .../org/apache/cxf/common/util/CacheMap.java| 10 
 .../apache/cxf/common/util/CacheMapTest.java| 50 
 2 files changed, 60 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/156fd30d/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java 
b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
index 9a6b112..5a4a419 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
@@ -19,6 +19,7 @@
 package org.apache.cxf.common.util;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
@@ -119,7 +120,16 @@ public class CacheMap implements Map {
 
 public V remove(Object key) {
 V v = mainDataMap.remove(key);
+Set keys = new HashSet<>(extraKeyMap.keySet());
 V v2 = extraKeyMap.remove(key);
+for (K nk : keys) {
+if (key.equals(nk)) {
+V v3 = extraKeyMap.remove(nk);
+if (v2 == null) {
+v2 = v3;
+}
+}
+}
 return v == null ? v2 : v;
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/156fd30d/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
--
diff --git a/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java 
b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
new file mode 100644
index 000..cdec8e4
--- /dev/null
+++ b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.common.util;
+
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+/**
+ * 
+ */
+public class CacheMapTest {
+
+@Test
+public void testRemove() {
+Map definitions = new CacheMap();
+
+Object putValue = new Object();
+
+String putKey = "test";
+definitions.put(putKey, putValue);
+
+String removeKey = new String("test");
+Object removeValue = definitions.remove(removeKey);
+
+Assert.assertEquals(putKey, removeKey);
+Assert.assertEquals(putValue, removeValue);
+Assert.assertTrue(definitions.isEmpty());
+}
+
+}

cxf-fediz git commit: Checkstyle fix

2017-04-11 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 1f42f03a4 -> 5aaa18f9c


Checkstyle fix


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/5aaa18f9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5aaa18f9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5aaa18f9

Branch: refs/heads/master
Commit: 5aaa18f9c2c6f559ec547c99d1da7f2ca6b55cef
Parents: 1f42f03
Author: Colm O hEigeartaigh 
Authored: Tue Apr 11 17:11:53 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Apr 11 17:11:53 2017 +0100

--
 .../apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5aaa18f9/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
--
diff --git 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
index f1f245b..2fca9f6 100644
--- 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
+++ 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.validator.routines.DomainValidator;
-import org.apache.commons.validator.routines.UrlValidator;
 import org.apache.commons.validator.routines.DomainValidator.ArrayType;
+import org.apache.commons.validator.routines.UrlValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.webflow.execution.RequestContext;

cxf-fediz git commit: Allow to specify an additional TLD for the CommonsURLValidator in the IdP

2017-04-11 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 731b9e8b6 -> 1f42f03a4


Allow to specify an additional TLD for the CommonsURLValidator in the IdP


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1f42f03a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1f42f03a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1f42f03a

Branch: refs/heads/master
Commit: 1f42f03a41915866d481ecc7fcefab9900f1b8a0
Parents: 731b9e8
Author: Colm O hEigeartaigh 
Authored: Tue Apr 11 17:09:03 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Apr 11 17:09:03 2017 +0100

--
 .../service/idp/beans/CommonsURLValidator.java   | 19 +--
 .../src/main/webapp/WEB-INF/security-config.xml  |  3 +++
 2 files changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1f42f03a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
--
diff --git 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
index fa40a55..f1f245b 100644
--- 
a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
+++ 
b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/beans/CommonsURLValidator.java
@@ -18,16 +18,19 @@
  */
 package org.apache.cxf.fediz.service.idp.beans;
 
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.commons.validator.routines.UrlValidator;
+import org.apache.commons.validator.routines.DomainValidator.ArrayType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 import org.springframework.webflow.execution.RequestContext;
 
 /**
  * Validate a URL using Commons Validator
  */
-@Component
 public class CommonsURLValidator {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(CommonsURLValidator.class);
@@ -49,4 +52,16 @@ public class CommonsURLValidator {
 return true;
 }
 
+public void setAdditionalTLDs(List additionalTLDs) {
+// Support additional top level domains
+if (additionalTLDs != null && !additionalTLDs.isEmpty()) {
+try {
+String[] tldsToAddArray = additionalTLDs.toArray(new 
String[additionalTLDs.size()]);
+LOG.info("Adding the following additional Top Level Domains: " 
+ Arrays.toString(tldsToAddArray));
+DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, 
tldsToAddArray);
+} catch (IllegalStateException ex) {
+//
+}
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1f42f03a/services/idp/src/main/webapp/WEB-INF/security-config.xml
--
diff --git a/services/idp/src/main/webapp/WEB-INF/security-config.xml 
b/services/idp/src/main/webapp/WEB-INF/security-config.xml
index 0bbafe3..da92d66 100644
--- a/services/idp/src/main/webapp/WEB-INF/security-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/security-config.xml
@@ -73,5 +73,8 @@

 
+
+

cxf-fediz git commit: Enable secure cookies by default

2017-04-11 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 4b209ef57 -> 731b9e8b6


Enable secure cookies by default


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/731b9e8b
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/731b9e8b
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/731b9e8b

Branch: refs/heads/master
Commit: 731b9e8b6f475a3b8fab2d12498d2981a99748d9
Parents: 4b209ef
Author: Colm O hEigeartaigh 
Authored: Tue Apr 11 16:51:58 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Apr 11 16:51:58 2017 +0100

--
 services/idp/src/main/webapp/WEB-INF/web.xml  | 1 +
 services/oidc/src/main/webapp/WEB-INF/web.xml | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/731b9e8b/services/idp/src/main/webapp/WEB-INF/web.xml
--
diff --git a/services/idp/src/main/webapp/WEB-INF/web.xml 
b/services/idp/src/main/webapp/WEB-INF/web.xml
index 807fa23..6a76251 100644
--- a/services/idp/src/main/webapp/WEB-INF/web.xml
+++ b/services/idp/src/main/webapp/WEB-INF/web.xml
@@ -28,6 +28,7 @@ under the License.


 true
+true
 
COOKIE


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/731b9e8b/services/oidc/src/main/webapp/WEB-INF/web.xml
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/web.xml 
b/services/oidc/src/main/webapp/WEB-INF/web.xml
index 9a22516..15c61fc 100644
--- a/services/oidc/src/main/webapp/WEB-INF/web.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/web.xml
@@ -27,6 +27,7 @@


 true
+true
 
COOKIE

cxf-dosgi git commit: Add swagger config to rest example

2017-04-11 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 1fbc19490 -> 89d9b3955


Add swagger config to rest example


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/89d9b395
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/89d9b395
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/89d9b395

Branch: refs/heads/master
Commit: 89d9b395551dbc1b6107046751a5f11b699984fd
Parents: 1fbc194
Author: Christian Schneider 
Authored: Tue Apr 11 17:29:15 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 11 17:29:15 2017 +0200

--
 samples/rest/README.md  |  2 +-
 samples/rest/api/pom.xml|  6 +
 .../cxf/dosgi/samples/rest/TaskResource.java|  3 +++
 samples/rest/impl-jackson/bnd.bnd   |  3 +++
 samples/rest/impl-jackson/pom.xml   |  6 +
 .../dosgi/samples/rest/impl/JacksonIntent.java  |  9 +++
 .../samples/rest/impl/TaskResourceImpl.java | 25 
 7 files changed, 45 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/89d9b395/samples/rest/README.md
--
diff --git a/samples/rest/README.md b/samples/rest/README.md
index 57e4ff7..eda3e1d 100644
--- a/samples/rest/README.md
+++ b/samples/rest/README.md
@@ -16,7 +16,7 @@ Unpack karaf 4 into a server and client directory.
 Start the server karaf
 
 ```
-feature:repo-add cxf-dosgi-samples 2.0.0
+feature:repo-add cxf-dosgi-samples 2.2.0-SNAPSHOT
 feature:install cxf-dosgi-sample-rest-impl
 rsa:endpoints
 ```

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/89d9b395/samples/rest/api/pom.xml
--
diff --git a/samples/rest/api/pom.xml b/samples/rest/api/pom.xml
index 3be339c..355a19a 100644
--- a/samples/rest/api/pom.xml
+++ b/samples/rest/api/pom.xml
@@ -40,6 +40,12 @@
 
org.apache.servicemix.specs.jsr339-api-2.0.1
 2.6.0
 
+
+io.swagger
+swagger-annotations
+1.5.13
+true
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/89d9b395/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
--
diff --git 
a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
 
b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
index e4a6798..2ccedb6 100644
--- 
a/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
+++ 
b/samples/rest/api/src/main/java/org/apache/cxf/dosgi/samples/rest/TaskResource.java
@@ -25,6 +25,9 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 
+import io.swagger.annotations.Api;
+
+@Api
 @Path("")
 @Produces("application/xml")
 public interface TaskResource {

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/89d9b395/samples/rest/impl-jackson/bnd.bnd
--
diff --git a/samples/rest/impl-jackson/bnd.bnd 
b/samples/rest/impl-jackson/bnd.bnd
new file mode 100644
index 000..3a89c4b
--- /dev/null
+++ b/samples/rest/impl-jackson/bnd.bnd
@@ -0,0 +1,3 @@
+Import-Package: \
+   io.swagger.jaxrs,\
+   *
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/89d9b395/samples/rest/impl-jackson/pom.xml
--
diff --git a/samples/rest/impl-jackson/pom.xml 
b/samples/rest/impl-jackson/pom.xml
index d8840f4..1ed144f 100644
--- a/samples/rest/impl-jackson/pom.xml
+++ b/samples/rest/impl-jackson/pom.xml
@@ -39,6 +39,12 @@
 ${project.version}
 
 
+org.apache.cxf
+cxf-rt-rs-service-description-swagger
+3.1.9
+provided
+
+
org.apache.aries.rsa
org.apache.aries.rsa.spi
1.9.0

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/89d9b395/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
--
diff --git 
a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
 
b/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
index dca20b2..980fcbe 100644
--- 
a/samples/rest/impl-jackson/src/main/java/org/apache/cxf/dosgi/samples/rest/impl/JacksonIntent.java
+++

cxf-dosgi git commit: [DOSGI-262] Allow to also publish external intents using IntentsProvider interface

2017-04-11 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 042b8a784 -> 1fbc19490


[DOSGI-262] Allow to also publish external intents using IntentsProvider 
interface


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/1fbc1949
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/1fbc1949
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/1fbc1949

Branch: refs/heads/master
Commit: 1fbc19490f2af1d29905e90993c13e4215790110
Parents: 042b8a7
Author: Christian Schneider 
Authored: Tue Apr 11 17:27:49 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 11 17:27:49 2017 +0200

--
 .../common/intent/impl/IntentManagerImpl.java   |  9 +-
 itests/multi-bundle/pom.xml | 10 --
 .../dosgi/itests/multi/TestCustomIntent.java|  2 ++
 .../customintent/CustomFeatureProvider.java | 33 
 .../customintent/CustomIntentActivator.java |  2 +-
 5 files changed, 52 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/1fbc1949/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java
--
diff --git 
a/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java
 
b/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java
index 67d82a7..2571fef 100644
--- 
a/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java
+++ 
b/common/src/main/java/org/apache/cxf/dosgi/common/intent/impl/IntentManagerImpl.java
@@ -109,7 +109,14 @@ public class IntentManagerImpl implements IntentManager {
 } catch (Exception e) {
 throw new RuntimeException(e); 
 }
-
+} else if (intent instanceof IntentsProvider) {
+try {
+IntentsProvider provider = (IntentsProvider)intent;
+List curIntents = provider.getIntents();
+intents.addAll(curIntents);
+} catch (Exception e) {
+throw new RuntimeException(e); 
+}
 } else {
 intents.add(intent);
 }

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/1fbc1949/itests/multi-bundle/pom.xml
--
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 72af8de..5e6aa0c 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -44,7 +44,13 @@
  -->
 
 
-
+   
+   org.apache.cxf.dosgi
+   cxf-dosgi-common
+   ${project.version}
+   
+
+   
 
 org.apache.geronimo.specs
 geronimo-atinject_1.0_spec
@@ -208,7 +214,7 @@
 
 org.apache.servicemix.tooling
 depends-maven-plugin
-1.3.1
+1.4.0
 
 
 generate-depends-file

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/1fbc1949/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java
--
diff --git 
a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java
 
b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java
index 2699b33..814066a 100644
--- 
a/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java
+++ 
b/itests/multi-bundle/src/test/java/org/apache/cxf/dosgi/itests/multi/TestCustomIntent.java
@@ -25,6 +25,7 @@ import java.util.concurrent.Callable;
 
 import org.apache.cxf.dosgi.itests.multi.customintent.ChangeTitleInterceptor;
 import org.apache.cxf.dosgi.itests.multi.customintent.CustomFeature;
+import org.apache.cxf.dosgi.itests.multi.customintent.CustomFeatureProvider;
 import org.apache.cxf.dosgi.itests.multi.customintent.CustomIntentActivator;
 import org.apache.cxf.dosgi.samples.soap.Task;
 import org.apache.cxf.dosgi.samples.soap.TaskService;
@@ -68,6 +69,7 @@ public class TestCustomIntent extends AbstractDosgiTest {
 return TinyBundles.bundle() //
 .add(CustomIntentActivator.class) //
 .add(CustomFeature.class) //
+.add(CustomFeatureProvider.class) //
 .add(ChangeTitleInterceptor.class) //
 .add(DummyTaskServiceImpl.class) //
 .set(Constants.BUNDLE_SYMBOLICNAME, "CustomIntent") //

cxf-fediz git commit: Remove isAnonymous apart from for the Metadata

2017-04-11 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master a2eec7eb4 -> 4b209ef57


Remove isAnonymous apart from for the Metadata


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/4b209ef5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/4b209ef5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/4b209ef5

Branch: refs/heads/master
Commit: 4b209ef577ad742c6f659656e86b89cb13ac9dfc
Parents: a2eec7e
Author: Colm O hEigeartaigh 
Authored: Tue Apr 11 16:01:44 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Apr 11 16:01:44 2017 +0100

--
 .../main/webapp/WEB-INF/config/security-clientcert-config.xml| 2 ++
 .../idp/src/main/webapp/WEB-INF/config/security-krb-config.xml   | 2 ++
 .../idp/src/main/webapp/WEB-INF/config/security-up-config.xml| 4 ++--
 services/idp/src/main/webapp/WEB-INF/security-config.xml | 1 +
 systests/custom/src/test/resources/realma/security-up-config.xml | 4 ++--
 .../samlsso/src/test/resources/realmb/security-config.xml| 4 ++--
 .../wsfed/src/test/resources/realmb/security-config.xml  | 4 ++--
 7 files changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4b209ef5/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml 
b/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
index d40d0c9..fc436ad 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-clientcert-config.xml
@@ -38,6 +38,7 @@
 
 
 
+
 
 
 
@@ -47,6 +48,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4b209ef5/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
--
diff --git 
a/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml 
b/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
index b66044b..c58 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-krb-config.xml
@@ -46,6 +46,7 @@
 
 
 
+
 
 
 
@@ -54,6 +55,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4b209ef5/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
--
diff --git a/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml 
b/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
index 657360d..f53c13d 100644
--- a/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/config/security-up-config.xml
@@ -40,7 +40,7 @@
 
 
 
-   
+   
 
 
 
@@ -61,7 +61,7 @@
 
 
 
-   
+   
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4b209ef5/services/idp/src/main/webapp/WEB-INF/security-config.xml
--
diff --git a/services/idp/src/main/webapp/WEB-INF/security-config.xml 
b/services/idp/src/main/webapp/WEB-INF/security-config.xml
index e51f906..0bbafe3 100644
--- a/services/idp/src/main/webapp/WEB-INF/security-config.xml
+++ b/services/idp/src/main/webapp/WEB-INF/security-config.xml
@@ -56,6 +56,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4b209ef5/systests/custom/src/test/resources/realma/security-up-config.xml
--
diff --git a/systests/custom/src/test/resources/realma/security-up-config.xml 
b/systests/custom/src/test/resources/realma/security-up-config.xml
index 5227fd2..6038bdd 100644
--- a/systests/custom/src/test/resources/realma/security-up-config.xml
+++ b/systests/custom/src/test/resources/realma/security-up-config.xml
@@ -40,7 +40,7 @@
 
 
 
-   
+   
 
 
 
@@ -62,7 +62,7 @@
 
 
 
-   
+   
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4b209ef5/systests/federation/samlsso/src/test/resources/realmb/security-config.xml
--
diff --git

cxf-fediz git commit: FEDIZ-199 - Update the Spring plugin to spring security 4

2017-04-11 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 3684347ed -> a2eec7eb4


FEDIZ-199 - Update the Spring plugin to spring security 4


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/a2eec7eb
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/a2eec7eb
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/a2eec7eb

Branch: refs/heads/master
Commit: a2eec7eb4a032dfc1f53a49c55b3c5ef9094aca6
Parents: 3684347
Author: Colm O hEigeartaigh 
Authored: Tue Apr 11 15:26:00 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Apr 11 15:26:00 2017 +0100

--
 .../web/FederationAuthenticationFilter.java |  3 +--
 pom.xml |  2 +-
 services/idp-core/pom.xml   |  4 +++
 .../WEB-INF/applicationContext-security.xml | 27 ++--
 .../WEB-INF/applicationContext-security.xml |  3 ++-
 5 files changed, 21 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a2eec7eb/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java
--
diff --git 
a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java
 
b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java
index db61219..485ca38 100644
--- 
a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java
+++ 
b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java
@@ -143,8 +143,7 @@ public class FederationAuthenticationFilter extends 
AbstractAuthenticationProces
  */
 @Override
 protected boolean requiresAuthentication(final HttpServletRequest request, 
final HttpServletResponse response) {
-boolean result = 
request.getRequestURI().contains(getFilterProcessesUrl());
-result |= isTokenExpired();
+boolean result = isTokenExpired() || 
super.requiresAuthentication(request, response);
 if (logger.isDebugEnabled()) {
 logger.debug("requiresAuthentication = " + result);
 }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a2eec7eb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e897862..de60dd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 2.5
 1.7.22
 4.3.5.RELEASE
-3.2.10.RELEASE
+4.2.2.RELEASE
 7.0.75
 8.5.12
 2.1.9

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a2eec7eb/services/idp-core/pom.xml
--
diff --git a/services/idp-core/pom.xml b/services/idp-core/pom.xml
index 8ef9646..c6ca035 100644
--- a/services/idp-core/pom.xml
+++ b/services/idp-core/pom.xml
@@ -28,6 +28,10 @@
 fediz-idp-core
 Apache Fediz IDP Core
 jar
+
+
+3.2.10.RELEASE
+
 
 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a2eec7eb/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
--
diff --git 
a/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
 
b/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
index 1b04079..b7b3ec5 100644
--- 
a/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ 
b/systests/webapps/springPreauthWebapp/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -26,10 +26,10 @@
 xmlns:sec="http://www.springframework.org/schema/security;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
 xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-http://www.springframework.org/schema/security 
http://www.springframework.org/schema/security/spring-security.xsd;>
+http://www.springframework.org/schema/security 
http://www.springframework.org/schema/security/spring-security-4.2.xsd;>
 
 
-
+
 
 
 
@@ -80,31 +80,30 @@
 
 
 
-
-
 
-
+
 
 
 
-
-
+
 
 
+
 
-
+
+
 
 
 
 
 
 
-
-
-
-
-
-
+
+
+

buildbot success in on cxf-site-production

2017-04-11 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/15628

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

cxf-fediz git commit: Fixing failing client certificate tests

2017-04-11 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.3.x-fixes 605760781 -> 4420496dd


Fixing failing client certificate tests


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/4420496d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/4420496d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/4420496d

Branch: refs/heads/1.3.x-fixes
Commit: 4420496dd48e6ec494a2cda9e31e5faf12a7509d
Parents: 6057607
Author: Colm O hEigeartaigh 
Authored: Tue Apr 11 12:58:24 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Tue Apr 11 12:58:24 2017 +0100

--
 services/sts/src/main/webapp/WEB-INF/cxf-transport.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/4420496d/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
--
diff --git a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml 
b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
index ae1939d..d3529ba 100644
--- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
+++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml
@@ -207,7 +207,7 @@
 
 
 
-
+

buildbot failure in on cxf-site-production

2017-04-11 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building . Full details are available at:
https://ci.apache.org/builders/cxf-site-production/builds/15627

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

cxf-dosgi git commit: Upgrade to official equinox 3.11.3

2017-04-11 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 40cfa39de -> 042b8a784


Upgrade to official equinox 3.11.3


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/042b8a78
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/042b8a78
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/042b8a78

Branch: refs/heads/master
Commit: 042b8a784de8428f37c5bb19ec3cc1f430f7e559
Parents: 40cfa39
Author: Christian Schneider 
Authored: Tue Apr 11 11:06:35 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 11 11:06:35 2017 +0200

--
 itests/multi-bundle/pom.xml | 2 +-
 parent/pom.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/042b8a78/itests/multi-bundle/pom.xml
--
diff --git a/itests/multi-bundle/pom.xml b/itests/multi-bundle/pom.xml
index 68d4fda..72af8de 100644
--- a/itests/multi-bundle/pom.xml
+++ b/itests/multi-bundle/pom.xml
@@ -81,7 +81,7 @@
 
 
 
-org.eclipse.tycho
+org.eclipse.platform
 org.eclipse.osgi

cxf-dosgi git commit: [DOSGI-265] Upgrade to Aries rsa 1.10.0

2017-04-11 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master c910b81f4 -> 40cfa39de


[DOSGI-265] Upgrade to Aries rsa 1.10.0


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/40cfa39d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/40cfa39d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/40cfa39d

Branch: refs/heads/master
Commit: 40cfa39de16567f9f64cfedd033d50262ed1fd86
Parents: c910b81
Author: Christian Schneider 
Authored: Tue Apr 11 11:03:12 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 11 11:03:12 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/40cfa39d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9a988ee..6fab8ee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
 
 5.0.0
 5.0.0
-1.9.0
+1.10.0
 3.1.11
 5.4.0
 3.4.8

cxf-dosgi git commit: [DOSGI-263] Update to CXF 3.1.11

2017-04-11 Thread cschneider 
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master a3a979380 -> c910b81f4


[DOSGI-263] Update to CXF 3.1.11


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/c910b81f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/c910b81f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/c910b81f

Branch: refs/heads/master
Commit: c910b81f4271a8acf1f37b91f494e5dd69989b78
Parents: a3a9793
Author: Christian Schneider 
Authored: Mon Apr 10 12:35:01 2017 +0200
Committer: Christian Schneider 
Committed: Tue Apr 11 10:46:10 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/c910b81f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f53b33d..9a988ee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -30,7 +30,7 @@
 5.0.0
 5.0.0
 1.9.0
-3.1.7
+3.1.11
 5.4.0
 3.4.8
 
1.0.0