You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/02/22 13:27:10 UTC

syncope git commit: Ensuring build works with JDK 1.7 - adding cxf-rt-transports-http-hc to support PATCH

Repository: syncope
Updated Branches:
  refs/heads/2_0_X 30c43ff1e -> 370e1af95


Ensuring build works with JDK 1.7 - adding cxf-rt-transports-http-hc to support PATCH


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

Branch: refs/heads/2_0_X
Commit: 370e1af95480e34e1286d5ef25c6270ce9e670c7
Parents: 30c43ff
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Feb 22 14:27:02 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Feb 22 14:27:02 2018 +0100

----------------------------------------------------------------------
 fit/core-reference/pom.xml                               |  6 ++++++
 .../test/java/org/apache/syncope/fit/AbstractITCase.java | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/370e1af9/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index f6ab69d..ddb098e 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -143,6 +143,12 @@ under the License.
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http-hc</artifactId>
+      <version>${cxf.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.syncope.ext.camel</groupId>
       <artifactId>syncope-ext-camel-rest-cxf</artifactId>
       <version>${project.version}</version>

http://git-wip-us.apache.org/repos/asf/syncope/blob/370e1af9/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index 1a19ffd..91eda38 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -41,6 +41,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.transport.http.asyncclient.AsyncHTTPConduit;
 import org.apache.syncope.client.lib.SyncopeClient;
 import org.apache.syncope.client.lib.SyncopeClientFactoryBean;
 import org.apache.syncope.common.lib.patch.AnyObjectPatch;
@@ -285,12 +286,16 @@ public abstract class AbstractITCase {
         relationshipTypeService = adminClient.getService(RelationshipTypeService.class);
         realmService = adminClient.getService(RealmService.class);
         anyObjectService = adminClient.getService(AnyObjectService.class);
-        roleService = adminClient.getService(RoleService.class);
-        dynRealmService = adminClient.getService(DynRealmService.class);
+        WebClient.getConfig(anyObjectService).getRequestContext().put(AsyncHTTPConduit.USE_ASYNC, true);
+        groupService = adminClient.getService(GroupService.class);
+        WebClient.getConfig(groupService).getRequestContext().put(AsyncHTTPConduit.USE_ASYNC, true);
         userService = adminClient.getService(UserService.class);
+        WebClient.getConfig(userService).getRequestContext().put(AsyncHTTPConduit.USE_ASYNC, true);
         userSelfService = adminClient.getService(UserSelfService.class);
+        WebClient.getConfig(userSelfService).getRequestContext().put(AsyncHTTPConduit.USE_ASYNC, true);
+        roleService = adminClient.getService(RoleService.class);
+        dynRealmService = adminClient.getService(DynRealmService.class);
         userWorkflowService = adminClient.getService(UserWorkflowService.class);
-        groupService = adminClient.getService(GroupService.class);
         resourceService = adminClient.getService(ResourceService.class);
         resourceHistoryService = adminClient.getService(ResourceHistoryService.class);
         configurationService = adminClient.getService(ConfigurationService.class);