You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/12/15 22:22:09 UTC
[1/3] cxf git commit: Exclude artifacts not available in central
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 601c0060e -> b3c5afdbb
Exclude artifacts not available in central
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/80a1247d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/80a1247d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/80a1247d
Branch: refs/heads/3.1.x-fixes
Commit: 80a1247de3735319858d0a24792b2647256f78ac
Parents: 601c006
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Dec 11 11:18:48 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Dec 15 16:21:56 2015 -0500
----------------------------------------------------------------------
parent/pom.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/80a1247d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 52c225b..7378dcb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1350,6 +1350,28 @@
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
<version>${cxf.spring.osgi.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>com.springsource.org.aopalliance</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.beans</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
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/b3c5afdb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b3c5afdb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b3c5afdb
Branch: refs/heads/3.1.x-fixes
Commit: b3c5afdbb8b7f78a23392bc3c751664a82fbe8bd
Parents: e0cd1e3
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Dec 15 16:21:59 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Dec 15 16:21:59 2015 -0500
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b3c5afdb/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9523e45..3ef4a7f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,4 +1,5 @@
origin/master
+B 0234c09c11c0f89bd17f9b82695daa12af1fad09
B 0d4cd0bbcaa6a4f80552d6b38f2a5e721ab20de9
B 39851b83af116611ce0efe70c4b9a32ee8491523
B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
[2/3] cxf git commit: [CXF-6711] Remove old deserialization code
which was very difficult to enable and didn't work correctly anyway.
Posted by dk...@apache.org.
[CXF-6711] Remove old deserialization code which was very difficult to enable and didn't work correctly anyway.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e0cd1e38
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e0cd1e38
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e0cd1e38
Branch: refs/heads/3.1.x-fixes
Commit: e0cd1e384faa3ee593102d5920cf4f7a54161573
Parents: 80a1247
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Dec 15 16:14:24 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Dec 15 16:21:58 2015 -0500
----------------------------------------------------------------------
.../apache/cxf/aegis/type/basic/ObjectType.java | 30 --------------------
.../cxf/aegis/type/encoded/TrailingBlocks.java | 1 -
2 files changed, 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e0cd1e38/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
index 435c2f8..8bf15de 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
@@ -54,7 +54,6 @@ public class ObjectType extends AegisType {
private static final QName XSI_NIL = new QName(Constants.URI_2001_SCHEMA_XSI, "nil");
private Set<AegisType> dependencies;
- private boolean serializedWhenUnknown;
private boolean readToDocument;
@SuppressWarnings("unchecked")
@@ -67,14 +66,8 @@ public class ObjectType extends AegisType {
this(dependencies, false);
}
- @SuppressWarnings("unchecked")
- public ObjectType(boolean serializeWhenUnknown) {
- this(Collections.EMPTY_SET, serializeWhenUnknown);
- }
-
public ObjectType(Set<AegisType> dependencies, boolean serializeWhenUnknown) {
this.dependencies = dependencies;
- this.serializedWhenUnknown = serializeWhenUnknown;
}
@Override
@@ -132,11 +125,6 @@ public class ObjectType extends AegisType {
}
if (null == type) {
- // TODO should check namespace as well..
- if (serializedWhenUnknown && "serializedJavaObject".equals(typeName)) {
- return reconstituteJavaObject(reader);
- }
-
throw new DatabindingException("No mapped type for '" + typeName + "' (" + typeQName + ")");
}
@@ -241,14 +229,6 @@ public class ObjectType extends AegisType {
this.readToDocument = readToDocument;
}
- public boolean isSerializedWhenUnknown() {
- return serializedWhenUnknown;
- }
-
- public void setSerializedWhenUnknown(boolean serializedWhenUnknown) {
- this.serializedWhenUnknown = serializedWhenUnknown;
- }
-
public void setDependencies(Set<AegisType> dependencies) {
this.dependencies = dependencies;
}
@@ -263,14 +243,4 @@ public class ObjectType extends AegisType {
return true;
}
- @Override
- public void writeSchema(XmlSchema root) {
- if (serializedWhenUnknown) {
- XmlSchemaSimpleType simple = new XmlSchemaSimpleType(root, true);
- simple.setName("serializedJavaObject");
- XmlSchemaSimpleTypeRestriction restriction = new XmlSchemaSimpleTypeRestriction();
- simple.setContent(restriction);
- restriction.setBaseTypeName(Constants.XSD_BASE64);
- }
- }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e0cd1e38/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
index 2c95897..b7cdee3 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
@@ -48,7 +48,6 @@ public class TrailingBlocks {
// we only work with mapped types
objectType = new ObjectType();
objectType.setReadToDocument(false);
- objectType.setSerializedWhenUnknown(false);
}
public TrailingBlocks(TypeMapping typeMapping) {