cxf git commit: CXF-7097: application leaks a creational context in CDI
Repository: cxf
Updated Branches:
refs/heads/master caac86161 -> 01cd14ce9
CXF-7097: application leaks a creational context in CDI
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/01cd14ce
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/01cd14ce
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/01cd14ce
Branch: refs/heads/master
Commit: 01cd14ce923f1f2cd044746e272b2d525c46f9a6
Parents: caac861
Author: reta
Authored: Tue Nov 8 17:45:22 2016 -0500
Committer: reta
Committed: Tue Nov 8 21:23:15 2016 -0500
--
.../apache/cxf/cdi/DefaultApplicationBean.java | 2 +-
.../cxf/cdi/JAXRSCdiResourceExtension.java | 40 ++--
.../cdi/src/main/resources/META-INF/beans.xml | 3 ++
.../cdi/base/AbstractCdiSingleAppTest.java | 2 +-
4 files changed, 41 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/01cd14ce/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
--
diff --git
a/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
index af83bbe..ed5afa6 100644
---
a/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
+++
b/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
@@ -49,7 +49,7 @@ class DefaultApplicationBean extends
AbstractCXFBean {
@Override
public void destroy(DefaultApplication defaultApplication,
CreationalContext
creationalContext) {
-
+creationalContext.release();
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/01cd14ce/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
--
diff --git
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 89b0094..0a6e032 100644
---
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -22,17 +22,20 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
+import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.ProcessBean;
@@ -58,10 +61,12 @@ public class JAXRSCdiResourceExtension implements Extension
{
private boolean hasBus;
private Bus bus;
-private final List< Bean< ? > > applicationBeans = new ArrayList< Bean< ?
> >();
+private final Set< Bean< ? > > applicationBeans = new LinkedHashSet< Bean<
? > >();
private final List< Bean< ? > > serviceBeans = new ArrayList< Bean< ? >
>();
private final List< Bean< ? > > providerBeans = new ArrayList< Bean< ? >
>();
private final List< Bean< ? extends Feature > > featureBeans = new
ArrayList< Bean< ? extends Feature > >();
+private final List< CreationalContext< ? > > disposableCreationalContexts
=
+new ArrayList< CreationalContext< ? > >();
@SuppressWarnings("unchecked")
public void collect(@Observes final ProcessBean< T > event) {
@@ -82,15 +87,17 @@ public class JAXRSCdiResourceExtension implements Extension
{
public void load(@Observes final AfterDeploymentValidation event, final
BeanManager beanManager) {
// no need of creational context, it only works for app scoped
instances anyway
final Bean busBean =
beanManager.resolve(beanManager.getBeans(CdiBusBean.CXF));
+
bus = (Bus)beanManager.getReference(
-busBean, Bus.class,
+busBean,
+Bus.class,
beanManager.createCreationalContext(busBean));
for (final Bean< ? > application: applicationBeans) {
final Application instance = (Application)beanManager.getReference(
application,
application.getBeanClass(),
-beanManager.createCreationalCon
cxf git commit: CXF-7097: application leaks a creational context in CDI
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes c06cc6dcf -> 1a670208b
CXF-7097: application leaks a creational context in CDI
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1a670208
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a670208
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a670208
Branch: refs/heads/3.1.x-fixes
Commit: 1a670208b139fee709869178b8e32f0c4d86c9a4
Parents: c06cc6d
Author: reta
Authored: Tue Nov 8 17:45:22 2016 -0500
Committer: reta
Committed: Tue Nov 8 17:45:22 2016 -0500
--
.../apache/cxf/cdi/DefaultApplicationBean.java | 2 +-
.../cxf/cdi/JAXRSCdiResourceExtension.java | 40 ++--
.../cdi/src/main/resources/META-INF/beans.xml | 3 ++
.../cdi/base/AbstractCdiSingleAppTest.java | 2 +-
4 files changed, 41 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1a670208/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
--
diff --git
a/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
index af83bbe..ed5afa6 100644
---
a/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
+++
b/integration/cdi/src/main/java/org/apache/cxf/cdi/DefaultApplicationBean.java
@@ -49,7 +49,7 @@ class DefaultApplicationBean extends
AbstractCXFBean {
@Override
public void destroy(DefaultApplication defaultApplication,
CreationalContext
creationalContext) {
-
+creationalContext.release();
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/1a670208/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
--
diff --git
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 2c03595..968424e 100644
---
a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++
b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -22,17 +22,20 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
+import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.ProcessBean;
@@ -57,10 +60,12 @@ public class JAXRSCdiResourceExtension implements Extension
{
private boolean hasBus;
private Bus bus;
-private final List< Bean< ? > > applicationBeans = new ArrayList< Bean< ?
> >();
+private final Set< Bean< ? > > applicationBeans = new LinkedHashSet< Bean<
? > >();
private final List< Bean< ? > > serviceBeans = new ArrayList< Bean< ? >
>();
private final List< Bean< ? > > providerBeans = new ArrayList< Bean< ? >
>();
private final List< Bean< ? extends Feature > > featureBeans = new
ArrayList< Bean< ? extends Feature > >();
+private final List< CreationalContext< ? > > disposableCreationalContexts
=
+new ArrayList< CreationalContext< ? > >();
@SuppressWarnings("unchecked")
public void collect(@Observes final ProcessBean< T > event) {
@@ -81,15 +86,17 @@ public class JAXRSCdiResourceExtension implements Extension
{
public void load(@Observes final AfterDeploymentValidation event, final
BeanManager beanManager) {
// no need of creational context, it only works for app scoped
instances anyway
final Bean busBean =
beanManager.resolve(beanManager.getBeans(CdiBusBean.CXF));
+
bus = (Bus)beanManager.getReference(
-busBean, Bus.class,
+busBean,
+Bus.class,
beanManager.createCreationalContext(busBean));
for (final Bean< ? > application: applicationBeans) {
final Application instance = (Application)beanManager.getReference(
application,
application.getBeanClass(),
-beanManager.createCre
svn commit: r1000755 - in /websites/production/cxf/content: cache/docs.pageCache docs/jaxrs-services-description.html
Author: buildbot
Date: Tue Nov 8 16:47:37 2016
New Revision: 1000755
Log:
Production update by buildbot for cxf
Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jaxrs-services-description.html
Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.
Modified: websites/production/cxf/content/docs/jaxrs-services-description.html
==
--- websites/production/cxf/content/docs/jaxrs-services-description.html
(original)
+++ websites/production/cxf/content/docs/jaxrs-services-description.html Tue
Nov 8 16:47:37 2016
@@ -118,12 +118,15 @@ Apache CXF -- JAXRS Services Description
JAX-RS Services
Description/**/
-WADL overview
+/*]]>*/
+Swagger
+Swagger-First
DevelopmentSwagger Auto
Generation
+WADL
+Overview
Basic exampleWADL with
referencesSharing
declarations between multiple WADLs
WADL-first
Development
wadl2java command
line tool
@@ -135,8 +138,9 @@ div.rbtoc1444312020284 li {margin-left:
Customizing WADL
Generation
Representing
explicit JAXB collectionsRepresenting
external schemas and non JAXB typesChanging the base
address
-java2wadl Maven
pluginWADL
TransformationsService listings
and WADL queriesWADL in JSON
formatHiding
links to JAXRS endpoints from the services page
-CXF JAX-RS supports (Web Application Description
Language|http://www.w3.org/Submission/wadl] (WADL). Users can
use WADL documents to generate the initial code and have WADL auto-generated on
demand.WADL
overviewWADL is a resource-centric description language which has been
designed to facilitate the modeling, description and testing of RESTful Web applications. Please check the official http://www.w3.org/Submission/wadl/";
rel="nofollow">page for more information, this section provides a brief
overview of main WADL constructs.Basic exampleA top level
WADL document element is called "application". Usually it may contain a
"grammars" section and "resources" element with one or more top-level
"resource" elements, with each one representing a specific root resource, for
example:class="codeContent panelContent pdl">
+java2wadl Maven
pluginWADL
TransformationsService listings
and WADL queriesWADL in JSON
format
+Hiding
links to JAXRS endpoints from the services page
+SwaggerSwagger-First
DevelopmentSwagger
Auto GenerationPlease see the http://cxf.apache.org/docs/swagger2feature.html";>Swagger2Feature page
for more informationWADLÂ CXF JAX-RS supports
(Web Application Description Language|http://www.w3.org/Submission/wadl]
(WADL). Users can use WADL documents to generate the initial
code and have WADL auto-generated on demand.OverviewWADL is a
resource-centric description language which has been designed to facilitate the
modeling, description and testing of RESTful Web applications.
Please check the official http://www.w3.org/Submission/wadl/"; rel="no
follow">page for more information, this section provides a brief overview
of main WADL constructs.Basic exampleA top level
WADL document element is called "application". Usually it may contain a
"grammars" section and "resources" element with one or more top-level
"resource" elements, with each one representing a specific root resource, for
example:
;
-This document describes an application that has
"http://localhost:8080/"; base URI. It can handle GET requests such as "http://localhost:8080/bookstore/1";,
"http://localhost:8080/bookstore/123";, etc. Additionally it can handle similar
GET requests at "http://localhost:8080/books/bookstore/1";,
"http://localhost:8080/books/bookstore/123";, etc, note an extra "books" path
segment."application/xml" media type is supported and response
representation elements link to "{http://superbooks"; rel="nofollow">http://superbooks}thebook" element
declared in a schema inlined in the grammars section.Note that
"resources" element has two child "resource" elements, one with
"/bookstore/{id}" path, another one with "/books" path.These 2 resources
can be represented as JAX-RS root resources. For example, these resources can
be mapped to concrete Java classes such as BookStoreRootResource
with @Path("/bookstore/
cxf-fediz git commit: FEDIZ-177 - Upgrade dbcp to 2.1.1
Repository: cxf-fediz
Updated Branches:
refs/heads/master 6262eab3c -> 26484f931
FEDIZ-177 - Upgrade dbcp to 2.1.1
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/26484f93
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/26484f93
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/26484f93
Branch: refs/heads/master
Commit: 26484f9317cc0af75a6e2d1e6e2626b339cbe811
Parents: 6262eab
Author: Colm O hEigeartaigh
Authored: Tue Nov 8 16:45:10 2016 +
Committer: Colm O hEigeartaigh
Committed: Tue Nov 8 16:45:10 2016 +
--
pom.xml| 1 +
services/idp/pom.xml | 6 +++---
services/idp/src/main/resources/persistenceContext.xml | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/26484f93/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c633a1e..1facafa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
1.5.1
3.1.8
3.2.0
+2.1.1
3.4
4.6.1
2.10.3
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/26484f93/services/idp/pom.xml
--
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 8332f9e..94a45bc 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -219,9 +219,9 @@
-->
-commons-dbcp
-commons-dbcp
-1.4
+org.apache.commons
+commons-dbcp2
+${dbcp.version}
org.apache.openjpa
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/26484f93/services/idp/src/main/resources/persistenceContext.xml
--
diff --git a/services/idp/src/main/resources/persistenceContext.xml
b/services/idp/src/main/resources/persistenceContext.xml
index 0eb1dd4..63d81f4 100644
--- a/services/idp/src/main/resources/persistenceContext.xml
+++ b/services/idp/src/main/resources/persistenceContext.xml
@@ -61,7 +61,7 @@
-
@@ -104,4 +104,4 @@
-
\ No newline at end of file
+
cxf-fediz git commit: Updating master to 1.4.0-SNAPSHOT
Repository: cxf-fediz Updated Branches: refs/heads/master f9897e43a -> 6262eab3c Updating master to 1.4.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6262eab3 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6262eab3 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6262eab3 Branch: refs/heads/master Commit: 6262eab3ccc1bf8128380a1d8a1d25e294a3ee9d Parents: f9897e4 Author: Colm O hEigeartaigh Authored: Tue Nov 8 15:37:40 2016 + Committer: Colm O hEigeartaigh Committed: Tue Nov 8 15:37:40 2016 + -- apache-fediz/pom.xml | 4 ++-- examples/jaxrsCxfPluginWebapp/pom.xml | 2 +- examples/jaxrsSimpleWebapp/pom.xml | 2 +- examples/jaxrsSpringSecurityWebapp/pom.xml | 2 +- examples/pom.xml | 2 +- examples/simpleWebapp/pom.xml | 2 +- examples/spring2Webapp/pom.xml | 2 +- examples/springPreauthWebapp/pom.xml | 2 +- examples/springWebapp/pom.xml | 2 +- examples/wsclientWebapp/pom.xml| 2 +- examples/wsclientWebapp/webapp/pom.xml | 2 +- examples/wsclientWebapp/webservice/common/pom.xml | 2 +- examples/wsclientWebapp/webservice/pom.xml | 2 +- examples/wsclientWebapp/webservice/service/pom.xml | 2 +- plugins/core/pom.xml | 2 +- plugins/cxf/pom.xml| 2 +- plugins/jetty8/pom.xml | 2 +- plugins/jetty9/pom.xml | 2 +- plugins/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/spring2/pom.xml| 2 +- plugins/tomcat7/pom.xml| 2 +- plugins/tomcat8/pom.xml| 2 +- pom.xml| 2 +- services/idp/pom.xml | 2 +- services/oidc/pom.xml | 2 +- services/pom.xml | 2 +- services/sts/pom.xml | 2 +- systests/cxf/pom.xml | 2 +- systests/federation/oidcIdpWebapp/pom.xml | 2 +- systests/federation/pom.xml| 2 +- systests/federation/samlIdpWebapp/pom.xml | 2 +- systests/federation/samlWebapp/pom.xml | 2 +- systests/federation/samlsso/pom.xml| 2 +- systests/federation/wsfed/pom.xml | 2 +- systests/idp/pom.xml | 2 +- systests/jetty8/pom.xml| 2 +- systests/jetty9/pom.xml| 2 +- systests/kerberos/pom.xml | 2 +- systests/ldap/pom.xml | 2 +- systests/oidc/pom.xml | 2 +- systests/pom.xml | 2 +- systests/samlsso/pom.xml | 2 +- systests/spring/pom.xml| 2 +- systests/tests/pom.xml | 2 +- systests/tomcat7/pom.xml | 2 +- systests/tomcat8/pom.xml | 2 +- systests/webapps/cxfWebapp/pom.xml | 2 +- systests/webapps/pom.xml | 2 +- systests/webapps/simpleWebapp/pom.xml | 2 +- systests/webapps/spring2Webapp/pom.xml | 2 +- systests/webapps/springPreauthWebapp/pom.xml | 2 +- systests/webapps/springWebapp/pom.xml | 2 +- 53 files changed, 54 insertions(+), 54 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6262eab3/apache-fediz/pom.xml -- diff --git a/apache-fediz/pom.xml b/apache-fediz/pom.xml index cb62244..e3ebe32 100644 --- a/apache-fediz/pom.xml +++ b/apache-fediz/pom.xml @@ -22,14 +22,14 @@ 4.0.0 org.apache.cxf.fediz apache-fediz -1.3.2-SNAPSHOT +1.4.0-SNAPSHOT Apache Fediz Assembly pom org.apache.cxf.fediz fediz -1.3.2-SNAPSHOT +1.4.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6262eab3/examples/jaxrsCxfPluginWebapp/pom.xml -- diff --git a/examples/jaxrsCxfPluginWebapp/pom.xml b/examples/jaxrsCxfPluginWebapp/pom.xml index ce39d37..b7f3256 100644 --- a/examples/jaxrsCxfPluginWebapp/pom.xml +++ b/examples/jaxrsCxfPluginWebapp/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.fediz examples -1.3.2-SNAPSHOT +
cxf-fediz git commit: Replaced deprecated Class-Name
Repository: cxf-fediz Updated Branches: refs/heads/1.3.x-fixes 1d904eda8 -> 450041ae8 Replaced deprecated Class-Name Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/450041ae Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/450041ae Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/450041ae Branch: refs/heads/1.3.x-fixes Commit: 450041ae8acc0546b36091d0c11e78dab4348d7b Parents: 1d904ed Author: Jan Bernhardt Authored: Wed Oct 12 14:52:31 2016 +0200 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 15:00:51 2016 + -- services/sts/src/main/webapp/WEB-INF/cxf-transport.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/450041ae/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 fb1376c..ae1939d 100644 --- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml +++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml @@ -105,14 +105,14 @@ - + - +
[13/14] cxf-fediz git commit: Fixing LDAP configuration
Fixing LDAP configuration Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1879dafc Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1879dafc Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1879dafc Branch: refs/heads/1.3.x-fixes Commit: 1879dafcc6a2c51b42be5413a5925a9b53d51e5d Parents: 940d2fb Author: Colm O hEigeartaigh Authored: Tue Oct 25 16:55:23 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:47:44 2016 + -- services/sts/src/main/webapp/WEB-INF/ldap.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1879dafc/services/sts/src/main/webapp/WEB-INF/ldap.xml -- diff --git a/services/sts/src/main/webapp/WEB-INF/ldap.xml b/services/sts/src/main/webapp/WEB-INF/ldap.xml index dbd3265..8b36f86 100644 --- a/services/sts/src/main/webapp/WEB-INF/ldap.xml +++ b/services/sts/src/main/webapp/WEB-INF/ldap.xml @@ -102,16 +102,16 @@ http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port"> - + - \ No newline at end of file +
[11/14] cxf-fediz git commit: Updating LDAP
Updating LDAP Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/afde06a1 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/afde06a1 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/afde06a1 Branch: refs/heads/1.3.x-fixes Commit: afde06a17d90346d827af1cfed8706aecf88ad12 Parents: e1ca166 Author: Colm O hEigeartaigh Authored: Wed Oct 19 15:49:26 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:47:12 2016 + -- services/sts/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/afde06a1/services/sts/pom.xml -- diff --git a/services/sts/pom.xml b/services/sts/pom.xml index 42df406..979a7d5 100644 --- a/services/sts/pom.xml +++ b/services/sts/pom.xml @@ -74,7 +74,7 @@ org.springframework.ldap spring-ldap-core -2.0.4.RELEASE +2.1.0.RELEASE compile
[08/14] cxf-fediz git commit: Updating some dependencies
Updating some dependencies Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e79c2795 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e79c2795 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e79c2795 Branch: refs/heads/1.3.x-fixes Commit: e79c2795e6fc0734fe357278d45bd60a4fabff7e Parents: fe5c61a Author: Colm O hEigeartaigh Authored: Mon Oct 17 11:05:40 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:46:41 2016 + -- pom.xml | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e79c2795/pom.xml -- diff --git a/pom.xml b/pom.xml index 2a07571..b0320c2 100644 --- a/pom.xml +++ b/pom.xml @@ -40,34 +40,34 @@ 2.0.0-M23 1.54 1.1.1 -3.4 +3.5 1.2 2.5 1.5.1 3.1.8-SNAPSHOT 3.2.0 3.4 -4.5.1 +4.6.1 2.9.0 4.3.5 2.3.4 -2.22 +2.23 3.16.1-GA 2.2 1.1.0.Final 3.3 -8.1.19.v20160209 -9.3.8.v20160314 +8.1.22.v20160922 +9.3.9.v20160517 4.12 1.2.17 -3.1.5 +3.1.11 2.4.1 2.5 1.7.21 -4.1.9.RELEASE +4.3.3.RELEASE 3.2.9.RELEASE -7.0.70 -8.0.36 +7.0.72 +8.0.38 2.1.7 http://localhost:8080/manager/text
[10/14] cxf-fediz git commit: Picking up latest CXF release
Picking up latest CXF release Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e1ca166a Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e1ca166a Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e1ca166a Branch: refs/heads/1.3.x-fixes Commit: e1ca166ad6368f5a74b4d2f0ad58f7498c28d28d Parents: ff78d7b Author: Colm O hEigeartaigh Authored: Wed Oct 19 09:59:39 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:46:59 2016 + -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e1ca166a/pom.xml -- diff --git a/pom.xml b/pom.xml index 176e432..0110631 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 1.2 2.5 1.5.1 -3.1.8-SNAPSHOT +3.1.8 3.2.0 3.4 4.6.1
[07/14] cxf-fediz git commit: Allow to define properties on STSClientAction to support other authentication styles against the STS (x509 for example)
Allow to define properties on STSClientAction to support other authentication
styles against the STS (x509 for example)
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/fe5c61ab
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/fe5c61ab
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/fe5c61ab
Branch: refs/heads/1.3.x-fixes
Commit: fe5c61ab08de600faba385b05c3b4ffd3109947f
Parents: b0774d6
Author: Jan Bernhardt
Authored: Thu Aug 4 16:16:07 2016 +0200
Committer: Colm O hEigeartaigh
Committed: Tue Nov 8 14:43:48 2016 +
--
.../fediz/service/idp/beans/STSClientAction.java| 16
1 file changed, 16 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fe5c61ab/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
--
diff --git
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
index dbfbed2..dbe4a25 100644
---
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
+++
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
@@ -24,6 +24,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.security.cert.X509Certificate;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.xml.namespace.QName;
@@ -92,6 +93,8 @@ public class STSClientAction {
protected String tokenType = WSConstants.WSS_SAML2_TOKEN_TYPE;
+protected Map properties;
+
protected boolean use200502Namespace;
protected int ttl = 1800;
@@ -102,6 +105,7 @@ public class STSClientAction {
private String keyType =
HTTP_DOCS_OASIS_OPEN_ORG_WS_SX_WS_TRUST_200512_BEARER;
+
public String getWsdlLocation() {
return wsdlLocation;
}
@@ -273,6 +277,10 @@ public class STSClientAction {
LOG.error("Protocol {} not supported for realm {} ",
serviceConfig.getProtocol(), realm);
throw new ProcessingException(TYPE.BAD_REQUEST);
}
+
+if (properties != null) {
+sts.setProperties(properties);
+}
Element rpToken = null;
try {
@@ -425,4 +433,12 @@ public class STSClientAction {
}
}
}
+
+public Map getProperties() {
+return properties;
+}
+
+public void setProperties(Map properties) {
+this.properties = properties;
+}
}
[02/14] cxf-fediz git commit: [FEDIZ-173] Cors support for js OIDC Implicit Flow, patch from Adrian Gonzalez applied, This closes #9
[FEDIZ-173] Cors support for js OIDC Implicit Flow, patch from Adrian Gonzalez
applied, This closes #9
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e88cf097
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e88cf097
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e88cf097
Branch: refs/heads/1.3.x-fixes
Commit: e88cf0979eb11a67193b4fc9d8e61197c6480c96
Parents: 6b29a87
Author: Sergey Beryozkin
Authored: Wed Sep 14 12:06:29 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Nov 8 14:43:03 2016 +
--
services/oidc/pom.xml | 5 +
.../oidc/src/main/webapp/WEB-INF/applicationContext.xml | 9 +
2 files changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e88cf097/services/oidc/pom.xml
--
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index ad3b515..aede1dd 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -58,6 +58,11 @@
${cxf.version}
+org.apache.cxf
+cxf-rt-rs-security-cors
+${cxf.version}
+
+
org.springframework
spring-web
${spring.version}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e88cf097/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index c893dd4..53bd83f 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -95,6 +95,7 @@
+
@@ -119,6 +120,7 @@
+
@@ -178,6 +180,13 @@
-->
+
+
+Authorization
+
+
+
+
[03/14] cxf-fediz git commit: Adding OIDC access token revocation service
Adding OIDC access token revocation service Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/df70c790 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/df70c790 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/df70c790 Branch: refs/heads/1.3.x-fixes Commit: df70c79026348f69bb3e2f37eb0df818d583f1de Parents: e88cf09 Author: Sergey Beryozkin Authored: Wed Sep 14 12:58:01 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:43:12 2016 + -- services/oidc/src/main/webapp/WEB-INF/applicationContext.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/df70c790/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml -- diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml index 53bd83f..6091725 100644 --- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml +++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml @@ -201,6 +201,10 @@ + + + + @@ -211,6 +215,7 @@ +
[06/14] cxf-fediz git commit: Optinally persisting client cred client records
Optinally persisting client cred client records
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b0774d6f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b0774d6f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b0774d6f
Branch: refs/heads/1.3.x-fixes
Commit: b0774d6fd19d087098a2961b365ea3da2aaec318
Parents: af92516
Author: Sergey Beryozkin
Authored: Mon Sep 26 13:46:59 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Nov 8 14:43:38 2016 +
--
.../service/oidc/OAuthDataProviderImpl.java | 32 +++-
1 file changed, 17 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b0774d6f/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
--
diff --git
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
index 6b402b7..a14af3b 100644
---
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
+++
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/OAuthDataProviderImpl.java
@@ -43,6 +43,7 @@ public class OAuthDataProviderImpl extends
DefaultEHCacheCodeDataProvider {
private static final Logger LOG =
LogUtils.getL7dLogger(OAuthDataProviderImpl.class);
private boolean checkOnlyRegisteredClients;
+private boolean persistUnregisteredClients = true;
private String contextName;
private Configuration loginConfig;
@@ -59,7 +60,6 @@ public class OAuthDataProviderImpl extends
DefaultEHCacheCodeDataProvider {
if (OAuthConstants.CLIENT_CREDENTIALS_GRANT.equals(grantType)) {
// Pre-registering the OAuth2 Client representations for
// "client_credentials" can be difficult.
-
String clientSecret =
(String)getMessageContext().get(OAuthConstants.CLIENT_SECRET);
if (clientSecret != null) {
// Direct authentication with the back-end storage
@@ -67,9 +67,7 @@ public class OAuthDataProviderImpl extends
DefaultEHCacheCodeDataProvider {
} else {
Principal p =
super.getMessageContext().getSecurityContext().getUserPrincipal();
if (clientId.equals(p.getName())) {
-Client c = new Client(clientId, null, true);
-
c.setAllowedGrantTypes(Collections.singletonList(OAuthConstants.CLIENT_CREDENTIALS_GRANT));
-return c;
+return createClientCredClient(clientId, null);
}
}
}
@@ -95,10 +93,9 @@ public class OAuthDataProviderImpl extends
DefaultEHCacheCodeDataProvider {
// Login using JAAS
CallbackHandler callbackHandler =
new NamePasswordCallbackHandler(clientId, clientSecret);
-LoginContext ctx = new LoginContext(getContextName(), null,
callbackHandler, loginConfig);
+LoginContext ctx = new LoginContext(contextName, null,
callbackHandler, loginConfig);
ctx.login();
-Client client = new Client(clientId, clientSecret, true);
-
client.setAllowedGrantTypes(Collections.singletonList(OAuthConstants.CLIENT_CREDENTIALS_GRANT));
+Client client = createClientCredClient(clientId, clientSecret);
ctx.logout();
return client;
} catch (LoginException ex) {
@@ -113,20 +110,25 @@ public class OAuthDataProviderImpl extends
DefaultEHCacheCodeDataProvider {
this.checkOnlyRegisteredClients = checkOnlyRegisteredClients;
}
-public String getContextName() {
-return contextName;
-}
-
public void setContextName(String contextName) {
this.contextName = contextName;
}
-public Configuration getLoginConfig() {
-return loginConfig;
-}
-
public void setLoginConfig(Configuration loginConfig) {
this.loginConfig = loginConfig;
}
+public void setPersistUnregisteredClients(boolean
persistUnregisteredClients) {
+this.persistUnregisteredClients = persistUnregisteredClients;
+}
+
+protected Client createClientCredClient(String clientId, String password) {
+Client c = new Client(clientId, password, true);
+
c.setAllowedGrantTypes(Collections.singletonList(OAuthConstants.CLIENT_CREDENTIALS_GRANT));
+if (persistUnregisteredClients) {
+// It will enable seeing these clients and their tokens in the
OIDC management console
+super.setClient(c);
+
[01/14] cxf-fediz git commit: [FEDIZ-174] Updating to CXF 3.1.8-SNAPSHOT
Repository: cxf-fediz
Updated Branches:
refs/heads/1.3.x-fixes [created] 1d904eda8
[FEDIZ-174] Updating to CXF 3.1.8-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6b29a87d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6b29a87d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6b29a87d
Branch: refs/heads/1.3.x-fixes
Commit: 6b29a87dd101f15d195fb59b220e67c7f25ec0e9
Parents: b4ac287
Author: Sergey Beryozkin
Authored: Wed Sep 14 11:41:23 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Nov 8 14:42:51 2016 +
--
pom.xml | 2 +-
services/idp/pom.xml| 5 -
services/idp/src/main/resources/restContext.xml | 8 +---
3 files changed, 6 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index beea523..2a07571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
1.2
2.5
1.5.1
-3.1.7
+3.1.8-SNAPSHOT
3.2.0
3.4
4.5.1
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/services/idp/pom.xml
--
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index f7f8824..b7e918f 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -259,11 +259,6 @@
-io.swagger
-swagger-jaxrs
-1.5.6
-
-
commons-validator
commons-validator
${commons.validator.version}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b29a87d/services/idp/src/main/resources/restContext.xml
--
diff --git a/services/idp/src/main/resources/restContext.xml
b/services/idp/src/main/resources/restContext.xml
index 6e3aaaf..1d6f446 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -55,7 +55,10 @@
-
+
+
+
+
@@ -65,8 +68,7 @@
-
-
+
[14/14] cxf-fediz git commit: Fixing merge
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1d904eda Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1d904eda Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1d904eda Branch: refs/heads/1.3.x-fixes Commit: 1d904eda8a7ca4236cff7bb1bc6cc022581fa939 Parents: 1879daf Author: Colm O hEigeartaigh Authored: Tue Nov 8 14:48:44 2016 + Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:48:44 2016 + -- services/sts/src/main/webapp/WEB-INF/ldap.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1d904eda/services/sts/src/main/webapp/WEB-INF/ldap.xml -- diff --git a/services/sts/src/main/webapp/WEB-INF/ldap.xml b/services/sts/src/main/webapp/WEB-INF/ldap.xml index 8b36f86..9ee9807 100644 --- a/services/sts/src/main/webapp/WEB-INF/ldap.xml +++ b/services/sts/src/main/webapp/WEB-INF/ldap.xml @@ -102,7 +102,7 @@ http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; serviceName="ns1:SecurityTokenService" endpointName="ns1:TransportUT_Port">
[04/14] cxf-fediz git commit: Adding OIDC .well-known configuration endpoint for clients to get jwks_uri and other endpoint addresses dynamically
Adding OIDC .well-known configuration endpoint for clients to get jwks_uri and other endpoint addresses dynamically Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/236744fd Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/236744fd Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/236744fd Branch: refs/heads/1.3.x-fixes Commit: 236744fd0583e2b77a2b5b043c54058e75b0 Parents: df70c79 Author: Sergey Beryozkin Authored: Wed Sep 14 14:37:44 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:43:18 2016 + -- .../oidc/src/main/webapp/WEB-INF/applicationContext.xml | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/236744fd/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml -- diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml index 6091725..eea9aa8 100644 --- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml +++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml @@ -225,6 +225,16 @@ - + + + + + + + + + + +
[12/14] cxf-fediz git commit: Switch to using https for repos
Switch to using https for repos Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/940d2fb7 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/940d2fb7 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/940d2fb7 Branch: refs/heads/1.3.x-fixes Commit: 940d2fb79268d05b6182f7a79fb8224676a0a420 Parents: afde06a Author: Colm O hEigeartaigh Authored: Tue Oct 25 14:29:02 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:47:18 2016 + -- pom.xml | 18 ++ 1 file changed, 2 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/940d2fb7/pom.xml -- diff --git a/pom.xml b/pom.xml index 0110631..a82ae12 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ apache.snapshots -http://repository.apache.org/snapshots/ +https://repository.apache.org/snapshots/ Apache Snapshot Repo true @@ -135,13 +135,6 @@ -central -https://repo1.maven.org/maven2 - -true - - - wasdev-maven-repo wasdev-maven-repo http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/ @@ -150,7 +143,7 @@ apache.snapshots -http://repository.apache.org/snapshots/ +https://repository.apache.org/snapshots/ Apache Snapshot Repo true @@ -160,13 +153,6 @@ -central -https://repo1.maven.org/maven2 - -true - - - Liberty Liberty Repository http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/maven/repository/
[05/14] cxf-fediz git commit: Fix dependencies to beanutils and ognl. This closes #10.
Fix dependencies to beanutils and ognl. This closes #10. Idp has a dependency to : * both commons-beanutils-core:1.8.3 and commons-beanutils:1.9.2. * opensymphony:ognl and ognl:ognl Excluded dependency to the oldest version of libraries. Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/af925166 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/af925166 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/af925166 Branch: refs/heads/1.3.x-fixes Commit: af925166aab61faf29d3753d96ac1ad45116466a Parents: 236744f Author: Adrian Gonzalez Authored: Sun Sep 18 22:24:21 2016 +0200 Committer: Colm O hEigeartaigh Committed: Tue Nov 8 14:43:29 2016 + -- services/idp/pom.xml | 14 ++ 1 file changed, 14 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/af925166/services/idp/pom.xml -- diff --git a/services/idp/pom.xml b/services/idp/pom.xml index b7e918f..e3ce225 100644 --- a/services/idp/pom.xml +++ b/services/idp/pom.xml @@ -100,6 +100,12 @@ org.springframework.webflow spring-webflow 2.3.4.RELEASE + + +opensymphony +ognl + + org.springframework.security @@ -256,6 +262,14 @@ com.sun.xml.bind jaxb-impl + + +commons-beanutils +commons-beanutils-core +
[09/14] cxf-fediz git commit: Switching jackson + updating ehcache
Switching jackson + updating ehcache
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ff78d7b3
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ff78d7b3
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ff78d7b3
Branch: refs/heads/1.3.x-fixes
Commit: ff78d7b39b6c5b1dafd1827f30f0524df18f3fe8
Parents: e79c279
Author: Colm O hEigeartaigh
Authored: Tue Oct 18 14:50:40 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Nov 8 14:46:51 2016 +
--
pom.xml | 2 +-
services/idp/pom.xml| 11 +++
services/idp/src/main/resources/restContext.xml | 2 +-
3 files changed, 5 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b0320c2..176e432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
3.2.0
3.4
4.6.1
-2.9.0
+2.10.3
4.3.5
2.3.4
2.23
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/services/idp/pom.xml
--
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index e3ce225..6edde85 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -196,14 +196,9 @@
${cxf.version}
-org.codehaus.jackson
-jackson-jaxrs
-1.9.13
-
-
-org.codehaus.jackson
-jackson-xc
-1.9.13
+com.fasterxml.jackson.jaxrs
+jackson-jaxrs-json-provider
+2.7.8
org.hsqldb
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ff78d7b3/services/idp/src/main/resources/restContext.xml
--
diff --git a/services/idp/src/main/resources/restContext.xml
b/services/idp/src/main/resources/restContext.xml
index 1d6f446..ba22cd3 100644
--- a/services/idp/src/main/resources/restContext.xml
+++ b/services/idp/src/main/resources/restContext.xml
@@ -53,7 +53,7 @@
-
+
[2/2] cxf-fediz git commit: Partial fix for home realm mapping issue
Partial fix for home realm mapping issue
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/f9897e43
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/f9897e43
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/f9897e43
Branch: refs/heads/master
Commit: f9897e43ac19f45c5a32a2491e5cc8cba4acf23c
Parents: c802d98
Author: Colm O hEigeartaigh
Authored: Tue Nov 8 13:46:33 2016 +
Committer: Colm O hEigeartaigh
Committed: Tue Nov 8 13:46:33 2016 +
--
.../src/main/webapp/WEB-INF/cxf-service.xml | 28 +-
.../fediz/integrationtests/HomeRealmParser.java | 31
.../test/resources/realma/entities-realma.xml | 10 +++
.../src/test/resources/rp/cxf-service.xml | 28 +-
4 files changed, 32 insertions(+), 65 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f9897e43/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
--
diff --git
a/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
b/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
index 9227893..58d6278 100644
--- a/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
+++ b/systests/federation/samlWebapp/src/main/webapp/WEB-INF/cxf-service.xml
@@ -54,21 +54,21 @@
-
-
+
+
-
-https://localhost:${idp.https.port}/fediz-idp/saml/up"/>
-
-
-
-
-
-
-
-
-
+
+ https://localhost:${idp.https.port}/fediz-idp/saml/up"/>
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f9897e43/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/HomeRealmParser.java
--
diff --git
a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/HomeRealmParser.java
b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/HomeRealmParser.java
deleted file mode 100644
index b72e09d..000
---
a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/HomeRealmParser.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * 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.fediz.integrationtests;
-
-/**
- *
- */
-public class HomeRealmParser {
-
-public String getRealm() {
-return "urn:org:apache:cxf:fediz:idp:realm-B";
-}
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f9897e43/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
--
diff --git
a/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
b/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
index 93e3dfe..93830da 100644
--- a/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
+++ b/systests/federation/samlsso/src/test/resources/realma/entities-realma.xml
@@ -26,9 +26,6 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-2.0.xsd";>
-
-
-
@@ -81,9 +78,10 @@
-
+
-
+
@@ -156,7 +154,7 @@
-
+
http://docs.oasis-open.org/wsfed/federation/200706"; />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/f9897e43/systests/federation/samlsso/src/test/resources/rp/cxf-service.xml
--
diff --git a/systests/federation/samlsso/src/test/resources/rp/cxf-service.xml
b/systests/federation/samlsso/src/test/resources/rp/cxf-servi
[1/2] cxf-fediz git commit: Adding HomeRealmParser and enabling SAML SSO federation test
Repository: cxf-fediz
Updated Branches:
refs/heads/master 722b70f02 -> f9897e43a
Adding HomeRealmParser and enabling SAML SSO federation test
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/c802d989
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/c802d989
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/c802d989
Branch: refs/heads/master
Commit: c802d98972472bc0de427b12b3573048f9d45aaa
Parents: 722b70f
Author: Colm O hEigeartaigh
Authored: Tue Nov 8 11:49:00 2016 +
Committer: Colm O hEigeartaigh
Committed: Tue Nov 8 11:49:00 2016 +
--
systests/federation/pom.xml | 2 +-
.../fediz/integrationtests/HomeRealmParser.java | 31 ++
.../cxf/fediz/integrationtests/SAMLSSOTest.java | 103 ++-
.../test/resources/realma/entities-realma.xml | 4 +
4 files changed, 68 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c802d989/systests/federation/pom.xml
--
diff --git a/systests/federation/pom.xml b/systests/federation/pom.xml
index aa32503..acafe82 100644
--- a/systests/federation/pom.xml
+++ b/systests/federation/pom.xml
@@ -35,7 +35,7 @@
samlIdpWebapp
oidcIdpWebapp
wsfed
-
+samlsso
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c802d989/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/HomeRealmParser.java
--
diff --git
a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/HomeRealmParser.java
b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/HomeRealmParser.java
new file mode 100644
index 000..b72e09d
--- /dev/null
+++
b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/HomeRealmParser.java
@@ -0,0 +1,31 @@
+/**
+ * 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.fediz.integrationtests;
+
+/**
+ *
+ */
+public class HomeRealmParser {
+
+public String getRealm() {
+return "urn:org:apache:cxf:fediz:idp:realm-B";
+}
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/c802d989/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
--
diff --git
a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
index b42a28c..45ddb8d 100644
---
a/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
+++
b/systests/federation/samlsso/src/test/java/org/apache/cxf/fediz/integrationtests/SAMLSSOTest.java
@@ -25,10 +25,19 @@ import java.io.IOException;
import javax.servlet.ServletException;
+import com.gargoylesoftware.htmlunit.CookieManager;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import com.gargoylesoftware.htmlunit.xml.XmlPage;
+
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -200,42 +209,23 @@ public class SAMLSSOTest {
}
@org.junit.Test
-@org.junit.Ignore
public void testWSFederation() throws Exception {
String url = "https://localhost:"; + getRpHttpsPort() +
"/wsfed/app1/services/25";
-System.out.println(url
[3/5] cxf git commit: Fix timeout handling by non async requests
Fix timeout handling by non async requests
(cherry picked from commit 1c34659984b1c3a64463471166a4c772597c0ac8)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5f4d837a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5f4d837a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5f4d837a
Branch: refs/heads/3.1.x-fixes
Commit: 5f4d837a723e97630053aac31797f6cc6eeb61f0
Parents: f3c121d
Author: William Montaz
Authored: Thu Nov 3 15:03:52 2016 +0100
Committer: Freeman Fang
Committed: Tue Nov 8 15:59:13 2016 +0800
--
.../cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5f4d837a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 72c6ebf..76f333b 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -619,7 +619,11 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
while (httpResponse == null) {
if (exception == null) { //already have an exception, skip
waiting
try {
-wait();
+if (isAsync) {
+wait();
+} else {
+wait(csPolicy.getReceiveTimeout());
+}
} catch (InterruptedException e) {
throw new IOException(e);
}
[1/5] cxf git commit: Fix read timeout when underlying Connection Pool cannot provide a connection right away
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 9e9dd3949 -> c06cc6dcf
Fix read timeout when underlying Connection Pool cannot provide a connection
right away
(cherry picked from commit a857349e851ee1aee9fa053e033473d5dae31e3c)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/156ea736
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/156ea736
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/156ea736
Branch: refs/heads/3.1.x-fixes
Commit: 156ea7366ce5aa70fcacec8868b41c9c54de40a1
Parents: 9e9dd39
Author: William Montaz
Authored: Wed Nov 2 15:46:54 2016 +0100
Committer: Freeman Fang
Committed: Tue Nov 8 15:58:56 2016 +0800
--
.../cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/156ea736/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
old mode 100644
new mode 100755
index 0ebcb81..1234ba4
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -471,6 +471,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
outbuf.shutdown();
}
public void cancelled() {
+handleCancelled();
inbuf.shutdown();
outbuf.shutdown();
}
@@ -610,12 +611,15 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
}
notifyAll();
}
+protected synchronized void handleCancelled(){
+notifyAll();
+}
protected synchronized HttpResponse getHttpResponse() throws
IOException {
while (httpResponse == null) {
if (exception == null) { //already have an exception, skip
waiting
try {
-wait(csPolicy.getReceiveTimeout());
+wait();
} catch (InterruptedException e) {
throw new IOException(e);
}
[5/5] cxf git commit: [CXF-7122]remove unnecessary Timer
[CXF-7122]remove unnecessary Timer
(cherry picked from commit caac861613b4df07eb3ff4023e1b9e53b07cd5ea)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c06cc6dc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c06cc6dc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c06cc6dc
Branch: refs/heads/3.1.x-fixes
Commit: c06cc6dcf2183eb9561a5d18af33b4563bf9a2fb
Parents: ffdb1bb
Author: Freeman Fang
Authored: Tue Nov 8 15:56:18 2016 +0800
Committer: Freeman Fang
Committed: Tue Nov 8 16:00:33 2016 +0800
--
.../http/asyncclient/AsyncHTTPConduit.java | 25
.../asyncclient/AsyncHTTPConduitFactory.java| 3 +--
.../http/asyncclient/SharedOutputBuffer.java| 1 -
3 files changed, 1 insertion(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c06cc6dc/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 7123ee9..4b4b934 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -38,7 +38,6 @@ import java.security.cert.Certificate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.TimerTask;
import java.util.concurrent.Future;
import java.util.logging.Level;
@@ -53,13 +52,11 @@ import org.apache.cxf.Bus;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.jsse.SSLUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.apache.cxf.endpoint.ClientCallback;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CacheAndWriteOutputStream;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.io.CopyingOutputStream;
-import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.service.model.EndpointInfo;
@@ -650,7 +647,6 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
protected void handleResponseAsync() throws IOException {
isAsync = true;
-//factory.timer.schedule(new CheckReceiveTimeoutForAsync(),
csPolicy.getReceiveTimeout());
}
protected void closeInputStream() throws IOException {
@@ -867,29 +863,8 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
}
}
-class CheckReceiveTimeoutForAsync extends TimerTask {
-public void run() {
-
-if (httpResponse == null) {
-outbuf.shutdown();
-inbuf.shutdown();
-if (exception != null) {
-throw new RuntimeException(exception);
-}
-
-Exchange exchange = outMessage.getExchange();
-// remove callback so that it won't be invoked twice
-ClientCallback cc = exchange.remove(ClientCallback.class);
-if (cc != null) {
-cc.handleException(null, new SocketTimeoutException());
-}
-}
-}
-}
-
}
-
public synchronized SSLContext getSSLContext(TLSClientParameters
tlsClientParameters)
throws GeneralSecurityException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/c06cc6dc/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
index d4ac6b1..ba0c2ea 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.http.asyncclient;
import java.io.IOException;
import java.util.Map;
-import java.util.Timer;
import java.util.concurrent.TimeUnit;
import org.apache.cxf.Bus;
@@ -132,7 +131,7 @@ public class AsyncHTTPConduitFactory i
[2/5] cxf git commit: Fix code formatting
Fix code formatting
(cherry picked from commit db55b103124617476fe817b1e398142eb7ee43a6)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3c121dd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3c121dd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3c121dd
Branch: refs/heads/3.1.x-fixes
Commit: f3c121dd625270d0dd2ee157306dd84f8213762e
Parents: 156ea73
Author: William Montaz
Authored: Wed Nov 2 18:03:14 2016 +0100
Committer: Freeman Fang
Committed: Tue Nov 8 15:59:05 2016 +0800
--
.../apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f3c121dd/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 1234ba4..72c6ebf 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -611,7 +611,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
}
notifyAll();
}
-protected synchronized void handleCancelled(){
+protected synchronized void handleCancelled() {
notifyAll();
}
[4/5] cxf git commit: Fix socket timeout and connection request timeout from AsyncHTTPClient
Fix socket timeout and connection request timeout from AsyncHTTPClient
(cherry picked from commit 4c6a9aaf61b5651d4fe0bb077e052bcd5196be71)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ffdb1bb2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ffdb1bb2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ffdb1bb2
Branch: refs/heads/3.1.x-fixes
Commit: ffdb1bb25b4f61bbb2481444ddd55a98e39cac20
Parents: 5f4d837
Author: William Montaz
Authored: Mon Nov 7 11:04:20 2016 +0100
Committer: Freeman Fang
Committed: Tue Nov 8 16:00:19 2016 +0800
--
.../transport/http/asyncclient/AsyncHTTPConduit.java| 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffdb1bb2/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
--
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 76f333b..7123ee9 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -220,7 +220,9 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
e.setEntity(entity);
RequestConfig.Builder b = RequestConfig.custom()
-.setConnectTimeout((int) csPolicy.getConnectionTimeout());
+.setConnectTimeout((int) csPolicy.getConnectionTimeout())
+.setSocketTimeout((int) csPolicy.getReceiveTimeout())
+.setConnectionRequestTimeout((int)
csPolicy.getReceiveTimeout());
Proxy p = proxyFactory.createProxy(csPolicy, uri);
if (p != null && p.type() != Proxy.Type.DIRECT) {
InetSocketAddress isa = (InetSocketAddress)p.address();
@@ -619,11 +621,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
while (httpResponse == null) {
if (exception == null) { //already have an exception, skip
waiting
try {
-if (isAsync) {
-wait();
-} else {
-wait(csPolicy.getReceiveTimeout());
-}
+wait();
} catch (InterruptedException e) {
throw new IOException(e);
}
@@ -652,7 +650,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
protected void handleResponseAsync() throws IOException {
isAsync = true;
-factory.timer.schedule(new CheckReceiveTimeoutForAsync(),
csPolicy.getReceiveTimeout());
+//factory.timer.schedule(new CheckReceiveTimeoutForAsync(),
csPolicy.getReceiveTimeout());
}
protected void closeInputStream() throws IOException {
