scheu 02/05/22 11:59:15
Modified: java/src/org/apache/axis/encoding
DefaultSOAP12TypeMappingImpl.java
DefaultTypeMappingImpl.java
java/src/org/apache/axis/wsdl/fromJava Types.java
java/src/org/apache/axis/wsdl/toJava Utils.java
java/test/wsdl/arrays PersonalInfoBookServiceTestCase.java
java/test/wsdl/types DynamicProxyTestCase.java
VerifyTestCase.java
Removed: java/src/javax/xml/rpc/holders ByteWrapperArrayHolder.java
Log:
Changed soapenc:base64 mapping from Byte[] to byte[] per JSR 101 v1.0.
* Removed ByteWrapperArrayHolder class
* Minor changes to testcases.
* Minor changes to typemapping registry
* Minor fix to wsdl/fromJava/Types
Revision Changes Path
1.4 +5 -6
xml-axis/java/src/org/apache/axis/encoding/DefaultSOAP12TypeMappingImpl.java
Index: DefaultSOAP12TypeMappingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DefaultSOAP12TypeMappingImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSOAP12TypeMappingImpl.java 16 Apr 2002 20:26:32 -0000 1.3
+++ DefaultSOAP12TypeMappingImpl.java 22 May 2002 18:59:15 -0000 1.4
@@ -120,14 +120,13 @@
null, null, false);
// SOAP 1.2
- // byte[] -ser-> XSD_BASE64
- // Byte[] -ser-> SOAP_BASE64
+ // byte[] -ser-> SOAP_BASE64
// XSD_BASE64 -deser-> byte[]
- // SOAP_BASE64 -deser->Byte[]
- myRegister(Constants.SOAP_BASE64, java.lang.Byte[].class,
- new Base64SerializerFactory(java.lang.Byte[].class,
+ // SOAP_BASE64 -deser->byte[]
+ myRegister(Constants.SOAP_BASE64, byte[].class,
+ new Base64SerializerFactory(byte[].class,
Constants.SOAP_BASE64 ),
- new Base64DeserializerFactory(java.lang.Byte[].class,
+ new Base64DeserializerFactory(byte[].class,
Constants.SOAP_BASE64),
true);
}
1.25 +3 -7
xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
Index: DefaultTypeMappingImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultTypeMappingImpl.java 13 May 2002 13:11:34 -0000 1.24
+++ DefaultTypeMappingImpl.java 22 May 2002 18:59:15 -0000 1.25
@@ -154,18 +154,14 @@
// SOAP 1.1
// byte[] -ser-> XSD_BASE64
- // Byte[] -ser-> array of Byte
// XSD_BASE64 -deser-> byte[]
// SOAP_BASE64 -deser->byte[]
- myRegister(Constants.SOAP_BASE64, Byte[].class,
- new Base64SerializerFactory(Byte[].class,
+ myRegister(Constants.SOAP_BASE64, byte[].class,
+ new Base64SerializerFactory(byte[].class,
Constants.SOAP_BASE64 ),
- new Base64DeserializerFactory(Byte[].class,
+ new Base64DeserializerFactory(byte[].class,
Constants.SOAP_BASE64),
true);
-// myRegister(Constants.SOAP_ARRAY, java.lang.Byte[].class,
-// new ArraySerializerFactory(),
-// new ArrayDeserializerFactory(),true);
myRegister(Constants.XSD_BASE64, byte[].class,
new Base64SerializerFactory(byte[].class,
Constants.XSD_BASE64 ),
1.25 +11 -7 xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
Index: Types.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Types.java 28 Apr 2002 18:10:57 -0000 1.24
+++ Types.java 22 May 2002 18:59:15 -0000 1.25
@@ -328,12 +328,16 @@
public String writeType(Class type) throws Exception {
// Quick return if schema type
- if (isSimpleSchemaType(type))
- return Constants.NSPREFIX_SCHEMA_XSD + ":" +
- getTypeQName(type).getLocalPart();
- if (isSimpleSoapEncodingType(type))
- return Constants.NSPREFIX_SOAP_ENC + ":" +
- getTypeQName(type).getLocalPart();
+ if (isSimpleType(type)) {
+ QName qName = getWsdlQName(getTypeQName(type));
+ if (Constants.isSchemaXSD(qName.getNamespaceURI())) {
+ return Constants.NSPREFIX_SCHEMA_XSD + ":" +
+ qName.getLocalPart();
+ } else {
+ return Constants.NSPREFIX_SOAP_ENC + ":" +
+ qName.getLocalPart();
+ }
+ }
// look up the serializer in the TypeMappingRegistry
Serializer ser = null;
@@ -602,7 +606,7 @@
type == java.lang.Long.class ||
type == java.lang.Short.class ||
type == java.math.BigDecimal.class ||
- type == java.lang.Byte[].class);
+ type == byte[].class);
}
/**
1.32 +1 -4 xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Utils.java 20 May 2002 20:07:29 -0000 1.31
+++ Utils.java 22 May 2002 18:59:15 -0000 1.32
@@ -86,12 +86,9 @@
public static String holder(TypeEntry type, Emitter emitter) {
String typeValue = type.getName();
- // byte[] and Byte[] have reserved holders
+ // byte[] has a reserved holders
if (typeValue.equals("byte[]")) {
return "javax.xml.rpc.holders.ByteArrayHolder";
- }
- else if (typeValue.equals("java.lang.Byte[]")) {
- return "javax.xml.rpc.holders.ByteWrapperArrayHolder";
}
// Anything else with [] gets its holder from the qname
else if (typeValue.endsWith("[]")) {
1.6 +3 -3
xml-axis/java/test/wsdl/arrays/PersonalInfoBookServiceTestCase.java
Index: PersonalInfoBookServiceTestCase.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/test/wsdl/arrays/PersonalInfoBookServiceTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PersonalInfoBookServiceTestCase.java 21 Mar 2002 16:20:48 -0000 1.5
+++ PersonalInfoBookServiceTestCase.java 22 May 2002 18:59:15 -0000 1.6
@@ -29,8 +29,8 @@
int[] id = new int[] { 0, 0, 7 };
int id2 = 123;
String[] foods = new String[] { "Cheeze Whiz", "Jolt Cola" };
- Byte[] nickName = new Byte[] { new Byte((byte)'g'), new Byte((byte)'e'),
- new Byte((byte)'e'), new Byte((byte)'k') };
+ byte[] nickName = new byte[] { (byte)'g', (byte)'e',
+ (byte)'e', (byte)'k'};
PersonalInfo pi = new PersonalInfo();
pi.setName(name);
pi.setFavoriteMovies(movies);
@@ -78,7 +78,7 @@
assertTrue("Food are corrupted " + value,
value.getFoods(1).equals(pi.getFoods(1)));
assertTrue("Nickname is corrupted " + value,
- value.getNickName()[1].equals(pi.getNickName()[1]));
+ value.getNickName()[1] == pi.getNickName()[1]);
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re );
1.4 +3 -4 xml-axis/java/test/wsdl/types/DynamicProxyTestCase.java
Index: DynamicProxyTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/types/DynamicProxyTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynamicProxyTestCase.java 13 May 2002 14:49:01 -0000 1.3
+++ DynamicProxyTestCase.java 22 May 2002 18:59:15 -0000 1.4
@@ -28,7 +28,6 @@
import javax.xml.rpc.holders.BooleanHolder;
import javax.xml.rpc.holders.BooleanWrapperHolder;
import javax.xml.rpc.holders.ByteArrayHolder;
-import javax.xml.rpc.holders.ByteWrapperArrayHolder;
import javax.xml.rpc.holders.ByteHolder;
import javax.xml.rpc.holders.CalendarHolder;
import javax.xml.rpc.holders.DoubleHolder;
@@ -114,7 +113,7 @@
new BigDecimal(0),
new Integer(0),
new Short((short)0),
- new Byte[0]);
+ new byte[0]);
}
catch (RemoteException re) {
re.printStackTrace();
@@ -155,7 +154,7 @@
new BigDecimalHolder(new BigDecimal(0)),
new IntegerWrapperHolder(new Integer(0)),
new ShortWrapperHolder(new Short((short)0)),
- new ByteWrapperArrayHolder(new Byte[0]));
+ new ByteArrayHolder(new byte[0]));
}
catch (RemoteException re) {
re.printStackTrace();
@@ -197,7 +196,7 @@
new BigDecimalHolder(),
new IntegerWrapperHolder(),
new ShortWrapperHolder(),
- new ByteWrapperArrayHolder());
+ new ByteArrayHolder());
}
catch (RemoteException re) {
throw new AssertionFailedError("Remote Exception caught: " + re);
1.21 +3 -13 xml-axis/java/test/wsdl/types/VerifyTestCase.java
Index: VerifyTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/types/VerifyTestCase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- VerifyTestCase.java 22 Apr 2002 17:33:32 -0000 1.20
+++ VerifyTestCase.java 22 May 2002 18:59:15 -0000 1.21
@@ -17,7 +17,6 @@
import javax.xml.rpc.holders.BooleanWrapperHolder;
import javax.xml.rpc.holders.BooleanHolder;
import javax.xml.rpc.holders.ByteArrayHolder;
-import javax.xml.rpc.holders.ByteWrapperArrayHolder;
import javax.xml.rpc.holders.ByteHolder;
import javax.xml.rpc.holders.CalendarHolder;
import javax.xml.rpc.holders.DoubleWrapperHolder;
@@ -108,7 +107,7 @@
new java.math.BigDecimal(7),
new Integer(0),
new Short((short) 0),
- new Byte[]{new Byte((byte) 7)});
+ new byte[]{(byte) 7});
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re );
}
@@ -135,7 +134,7 @@
new BigDecimalHolder(new java.math.BigDecimal(12)),
new IntegerWrapperHolder(new Integer(13)),
new ShortWrapperHolder(new Short((short) 14)),
- new ByteWrapperArrayHolder(new Byte[]{new Byte((byte) 15)}));
+ new ByteArrayHolder(new byte[]{(byte) 15}));
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re );
}
@@ -162,7 +161,7 @@
new BigDecimalHolder(),
new IntegerWrapperHolder(),
new ShortWrapperHolder(),
- new ByteWrapperArrayHolder());
+ new ByteArrayHolder());
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re );
}
@@ -597,15 +596,6 @@
} catch (java.rmi.RemoteException re) {
throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re );
}
-// Comment out for now because causes compile errors
-// try {
-// Byte[] sendValue = {new java.lang.Byte((byte) 10), new
java.lang.Byte((byte) 9)};
-// ByteWrapperArrayHolder bach = new ByteWrapperArrayHolder(sendValue);
-// Byte[] actual = binding.methodSoapBase64(sendValue, bach);
-// } catch (java.rmi.RemoteException re) {
-// throw new junit.framework.AssertionFailedError("Remote Exception
caught: " + re );
-// }
-
}
}
