antelder 2003/01/14 06:59:57
Modified: java/src/org/apache/wsif/providers/soap/apacheaxis
WSIFOperation_ApacheAxis.java
WSIFAXISConstants.java
java/src/org/apache/wsif WSIFConstants.java
Log:
Tidy up the context constants from yesterdays context changes
Revision Changes Path
1.60 +6 -6
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
Index: WSIFOperation_ApacheAxis.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- WSIFOperation_ApacheAxis.java 14 Jan 2003 14:48:53 -0000 1.59
+++ WSIFOperation_ApacheAxis.java 14 Jan 2003 14:59:54 -0000 1.60
@@ -1918,7 +1918,7 @@
static void registerDefaultTypeMappings(TypeMapping callTypeMappings,
WSIFMessage context) throws WSIFException {
Object value = null;
try {
- value =
context.getObjectPart(WSIFConstants.CONTEXT_DEFAULT_SOAP_TYPE_MAPPINGS);
+ value =
context.getObjectPart(WSIFAXISConstants.CONTEXT_DEFAULT_SOAP_TYPE_SERIALIZERS);
} catch (WSIFException e) {
Trc.ignoredException(e);
}
@@ -1928,7 +1928,7 @@
if (!(value instanceof List)) {
throw new WSIFException(
"context part '"
- + WSIFConstants.CONTEXT_DEFAULT_SOAP_TYPE_MAPPINGS
+ + WSIFAXISConstants.CONTEXT_DEFAULT_SOAP_TYPE_SERIALIZERS
+ "' value is not an instance of java.util.List: "
+ value);
}
@@ -1938,7 +1938,7 @@
if (!(o instanceof org.apache.wsif.util.TypeSerializer)) {
throw new WSIFException(
"context part '"
- + WSIFConstants.CONTEXT_DEFAULT_SOAP_TYPE_MAPPINGS
+ + WSIFAXISConstants.CONTEXT_DEFAULT_SOAP_TYPE_SERIALIZERS
+ "' value List contains an entry that is not an instance "
+ "of org.apache.wsif.util.TypeSerializer: "
+ value);
@@ -2044,7 +2044,7 @@
Object value = null;
try {
- value =
context.getObjectPart(WSIFConstants.CONTEXT_SOAP_TYPE_SERIALIZERS);
+ value =
context.getObjectPart(WSIFAXISConstants.CONTEXT_SOAP_TYPE_SERIALIZERS);
} catch (WSIFException e) {
Trc.ignoredException(e);
}
@@ -2054,7 +2054,7 @@
if (!(value instanceof List)) {
throw new WSIFException(
"context part '"
- + WSIFConstants.CONTEXT_DEFAULT_SOAP_TYPE_MAPPINGS
+ + WSIFAXISConstants.CONTEXT_SOAP_TYPE_SERIALIZERS
+ "' value is not an instance of java.util.List: "
+ value);
}
@@ -2065,7 +2065,7 @@
if (!(o instanceof TypeSerializer)) {
throw new WSIFException(
"context part '"
- + WSIFConstants.CONTEXT_DEFAULT_SOAP_TYPE_MAPPINGS
+ + WSIFAXISConstants.CONTEXT_SOAP_TYPE_SERIALIZERS
+ "' value List contains an entry that is not an instance "
+ "of org.apache.wsif.util.TypeSerializer: "
+ value);
1.3 +14 -0
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFAXISConstants.java
Index: WSIFAXISConstants.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFAXISConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSIFAXISConstants.java 7 Dec 2002 12:33:52 -0000 1.2
+++ WSIFAXISConstants.java 14 Jan 2003 14:59:55 -0000 1.3
@@ -103,4 +103,18 @@
public static final String AXIS_STYLE_MESSAGE = "message";
public static final String AXIS_STYLE_WRAPPED = "wrapped";
+ /**
+ * WSIF context part name for any default type serializers
+ * The context value should be an ArrayList of TypeSerializer objects
+ */
+ public static final String CONTEXT_DEFAULT_SOAP_TYPE_SERIALIZERS =
+ "org.apache.wsif.axis.default.type.serializers";
+
+ /**
+ * WSIF context part name to override default (de)serializers for a type
+ * The context value should be an ArrayList of TypeSerializer objects
+ */
+ public static final String CONTEXT_SOAP_TYPE_SERIALIZERS =
+ "org.apache.wsif.axis.type.serializers";
+
}
1.15 +0 -14 xml-axis-wsif/java/src/org/apache/wsif/WSIFConstants.java
Index: WSIFConstants.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/WSIFConstants.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WSIFConstants.java 13 Jan 2003 22:36:52 -0000 1.14
+++ WSIFConstants.java 14 Jan 2003 14:59:57 -0000 1.15
@@ -131,20 +131,6 @@
"org.apache.wsif.soap.RequestHeaders";
/**
- * WSIF context part name for any default type serializers
- * The context value should be an ArrayList of TypeSerializer objects
- */
- public static final String CONTEXT_DEFAULT_SOAP_TYPE_MAPPINGS =
- "org.apache.wsif.soap.default.type.serializers";
-
- /**
- * WSIF context part name for to override default (de)serializers for a type
- * The context value should be an ArrayList of TypeSerializer objects
- */
- public static final String CONTEXT_SOAP_TYPE_SERIALIZERS =
- "org.apache.wsif.soap.type.serializers";
-
- /**
* WSIF context part name prefix for JMSProperties
*/
public static final String CONTEXT_JMS_PREFIX = "JMSProperty.";
