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/ad5e91a3 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ad5e91a3 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ad5e91a3 Branch: refs/heads/1.2.x-fixes Commit: ad5e91a3ccb8177e46ccb38f4d33271bbbb4258f Parents: 35c613b Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Sep 4 17:03:08 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Sep 4 17:15:40 2015 +0100 ---------------------------------------------------------------------- services/sts/src/main/webapp/WEB-INF/cxf-transport.xml | 4 ++-- systests/jetty8/src/test/resources/rp-client-cert-server.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ad5e91a3/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 572e216..d3ea403 100644 --- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml +++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml @@ -132,8 +132,8 @@ <bean id="conditionsProvider" class="org.apache.cxf.sts.token.provider.DefaultConditionsProvider"> - <property name="lifetime" value="5" /> - <property name="acceptClientLifetime" value="false" /> + <property name="lifetime" value="1200" /> + <property name="acceptClientLifetime" value="true" /> </bean> <util:list id="attributeStatementProvidersList"> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ad5e91a3/systests/jetty8/src/test/resources/rp-client-cert-server.xml ---------------------------------------------------------------------- diff --git a/systests/jetty8/src/test/resources/rp-client-cert-server.xml b/systests/jetty8/src/test/resources/rp-client-cert-server.xml index a5b38bf..d3f4c52 100644 --- a/systests/jetty8/src/test/resources/rp-client-cert-server.xml +++ b/systests/jetty8/src/test/resources/rp-client-cert-server.xml @@ -17,7 +17,6 @@ specific language governing permissions and limitations under the License. --> -<?xml version="1.0"?> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd";> <Configure id="RPServer" class="org.eclipse.jetty.server.Server">
