You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2009/10/31 23:59:18 UTC
svn commit: r831612 - in /cxf/trunk/rt/databinding/aegis/src:
main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
test/java/org/apache/cxf/aegis/oldconfig/Pre21ConfigCompatTest.java
Author: bimargulies
Date: Sat Oct 31 22:59:17 2009
New Revision: 831612
URL: http://svn.apache.org/viewvc?rev=831612&view=rev
Log:
Remove long-deprecated string properties from AegisDatabinding.
Removed:
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/oldconfig/Pre21ConfigCompatTest.java
Modified:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=831612&r1=831611&r2=831612&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Sat Oct 31 22:59:17 2009
@@ -54,7 +54,6 @@
import org.apache.cxf.databinding.DataWriter;
import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.frontend.SimpleMethodDispatcher;
-import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.AbstractMessageContainer;
import org.apache.cxf.service.model.FaultInfo;
@@ -80,20 +79,6 @@
*/
public class AegisDatabinding extends AbstractDataBinding {
- // these are here only for compatibility.
- /**
- * @deprecated 2.1
- */
- public static final String WRITE_XSI_TYPE_KEY = "writeXsiType";
- /**
- * @deprecated 2.1
- */
- public static final String OVERRIDE_TYPES_KEY = "overrideTypesList";
- /**
- * @deprecated 2.1
- */
- public static final String READ_XSI_TYPE_KEY = "readXsiType";
-
protected static final int IN_PARAM = 0;
protected static final int OUT_PARAM = 1;
protected static final int FAULT_PARAM = 2;
@@ -197,27 +182,7 @@
if (aegisContext == null) {
aegisContext = new AegisContext();
- Object val = s.get(READ_XSI_TYPE_KEY);
- if ("false".equals(val) || Boolean.FALSE.equals(val)) {
- aegisContext.setReadXsiTypes(false);
- }
-
- val = s.get(WRITE_XSI_TYPE_KEY);
- if ("true".equals(val) || Boolean.TRUE.equals(val)) {
- aegisContext.setWriteXsiTypes(true);
- }
-
- val = s.get(OVERRIDE_TYPES_KEY);
- if (val != null) {
- Collection nameCollection = (Collection)val;
- Collection<String> typeNames = CastUtils.cast(nameCollection, String.class);
- if (overrideTypes == null) {
- overrideTypes = new HashSet<String>();
- }
- overrideTypes.addAll(typeNames);
- }
-
- val = s.get("mtom-enabled");
+ Object val = s.get("mtom-enabled");
if ("true".equals(val) || Boolean.TRUE.equals(val) || mtomEnabled) {
aegisContext.setMtomEnabled(true);
}