You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/10/17 21:19:25 UTC
[1/2] git commit: Few more minor updates to JsonMapObject provider
Repository: cxf
Updated Branches:
refs/heads/master ea512e887 -> d1e764dcf
Few more minor updates to JsonMapObject provider
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2efbac3c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2efbac3c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2efbac3c
Branch: refs/heads/master
Commit: 2efbac3cd55222b6e85d6f6fb29f63e822974bb7
Parents: 3f35e99
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Oct 17 20:18:14 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Fri Oct 17 20:18:14 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java | 2 +-
.../org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2efbac3c/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
index 1e6adcd..3001833 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
@@ -25,7 +25,7 @@ import java.util.Map;
public class JsonMapObject {
Map<String, Integer> updateCount;
- private Map<String, Object> values = new LinkedHashMap<String, Object>();
+ Map<String, Object> values = new LinkedHashMap<String, Object>();
public JsonMapObject() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2efbac3c/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java
index 9387a7d..9de4059 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObjectProvider.java
@@ -76,7 +76,8 @@ public class JsonMapObjectProvider implements MessageBodyReader<JsonMapObject>,
} else {
try {
Constructor<?> c = cls.getConstructor(Map.class);
- JsonMapObject actualObj = (JsonMapObject)c.newInstance(obj.asMap());
+ JsonMapObject actualObj = (JsonMapObject)c.newInstance();
+ actualObj.values = obj.values;
actualObj.updateCount = obj.updateCount;
return actualObj;
} catch (Exception ex) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf
Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d1e764dc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d1e764dc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d1e764dc
Branch: refs/heads/master
Commit: d1e764dcfaae7dc6f5deb48373acb7a6ad688762
Parents: 2efbac3 ea512e8
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Oct 17 20:18:54 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Fri Oct 17 20:18:54 2014 +0100
----------------------------------------------------------------------
.../wss4j/UsernameTokenInterceptor.java | 45 ++++++--
.../sts/deployment/CustomClaimsHandler.java | 76 +++++++++++++
.../systest/sts/jaas/ClaimsCallbackHandler.java | 68 ++++++++++++
.../apache/cxf/systest/sts/jaas/JAASTest.java | 106 +++++++++++++++++++
.../org/apache/cxf/systest/sts/jaas/Server.java | 46 ++++++++
.../systest/sts/deployment/cxf-transport.xml | 21 +++-
.../apache/cxf/systest/sts/jaas/DoubleIt.wsdl | 53 ++++++++++
.../apache/cxf/systest/sts/jaas/cxf-client.xml | 37 +++++++
.../apache/cxf/systest/sts/jaas/cxf-service.xml | 100 +++++++++++++++++
9 files changed, 545 insertions(+), 7 deletions(-)
----------------------------------------------------------------------