scheu 02/03/29 14:13:06
Modified: java/src/org/apache/axis/encoding/ser
BaseDeserializerFactory.java
BaseSerializerFactory.java
java/src/org/apache/axis/utils JavaUtils.java
java/src/org/apache/axis/wsdl WSDL2Java.java
java/src/org/apache/axis/wsdl/toJava Emitter.java
JavaBeanHelperWriter.java JavaDefinitionWriter.java
JavaWriterFactory.java
Log:
A few minor changes to make classes more extendable.
Revision Changes Path
1.3 +1 -1
xml-axis/java/src/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
Index: BaseDeserializerFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BaseDeserializerFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseDeserializerFactory.java 28 Mar 2002 18:41:16 -0000 1.2
+++ BaseDeserializerFactory.java 29 Mar 2002 22:13:05 -0000 1.3
@@ -180,7 +180,7 @@
if (getDeserializer == null && firstCall) {
try {
getDeserializer =
- javaType.getMethod("getDeserialier",
+ javaType.getMethod("getDeserializer",
new Class[] {String.class,
Class.class,
QName.class});
1.5 +1 -1
xml-axis/java/src/org/apache/axis/encoding/ser/BaseSerializerFactory.java
Index: BaseSerializerFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BaseSerializerFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseSerializerFactory.java 28 Mar 2002 18:41:16 -0000 1.4
+++ BaseSerializerFactory.java 29 Mar 2002 22:13:05 -0000 1.5
@@ -185,7 +185,7 @@
if (getSerializer == null && firstCall) {
try {
getSerializer =
- javaType.getMethod("getSerialier",
+ javaType.getMethod("getSerializer",
new Class[] {String.class,
Class.class,
QName.class});
1.38 +22 -0 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- JavaUtils.java 27 Mar 2002 18:29:08 -0000 1.37
+++ JavaUtils.java 29 Mar 2002 22:13:05 -0000 1.38
@@ -115,6 +115,28 @@
return null;
}
+ public static String getWrapper(String primitive)
+ {
+ if (primitive.equals("int"))
+ return "Integer";
+ else if (primitive.equals("short"))
+ return "Short";
+ else if (primitive.equals("boolean"))
+ return "Boolean";
+ else if (primitive.equals("byte"))
+ return "Byte";
+ else if (primitive.equals("long"))
+ return "Long";
+ else if (primitive.equals("double"))
+ return "Double";
+ else if (primitive.equals("float"))
+ return "Float";
+ else if (primitive.equals("char"))
+ return "Character";
+
+ return null;
+ }
+
public static Class getPrimitiveClass(Class wrapper)
{
if (wrapper == java.lang.Integer.class)
1.21 +2 -2 xml-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java
Index: WSDL2Java.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WSDL2Java.java 24 Mar 2002 12:08:40 -0000 1.20
+++ WSDL2Java.java 29 Mar 2002 22:13:05 -0000 1.21
@@ -111,11 +111,11 @@
public static final byte SESSION_SCOPE = 0x11;
// The emitter framework Emitter class.
- private Emitter emitter;
+ protected Emitter emitter;
// Timeout, in milliseconds, to let the Emitter do its work
private long timeoutms = 45000; // 45 sec default
- JavaWriterFactory writerFactory = null;
+ protected JavaWriterFactory writerFactory = null;
/**
* Define the understood options. Each CLOptionDescriptor contains:
1.30 +1 -0 xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Emitter.java 27 Mar 2002 22:58:17 -0000 1.29
+++ Emitter.java 29 Mar 2002 22:13:05 -0000 1.30
@@ -143,6 +143,7 @@
ClassLoader cl = Thread.currentThread().getContextClassLoader();
writerFactory = (WriterFactory)
Class.forName(className, true,cl).newInstance();
+ writerFactory.setEmitter(this);
}
catch (Exception ex) {
ex.printStackTrace();
1.3 +3 -4
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
Index: JavaBeanHelperWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaBeanHelperWriter.java 28 Mar 2002 18:41:17 -0000 1.2
+++ JavaBeanHelperWriter.java 29 Mar 2002 22:13:05 -0000 1.3
@@ -80,7 +80,6 @@
* @param elements Vector containing the Type and name of each property
* @param extendType The type representing the extended class (or null)
* @param attributes Vector containing the attribute types and names
- * @param extendType The type representing the extended clas (or null)
*/
protected JavaBeanHelperWriter(
Emitter emitter,
@@ -121,7 +120,7 @@
/**
* write MetaData code
*/
- protected void writeMetaData() {
+ protected void writeMetaData() throws IOException {
// Collect elementMappings
if (elements != null) {
for (int i = 0; i < elements.size(); i++) {
@@ -206,7 +205,7 @@
* write Serializer getter code and pass in meta data to avoid
* undo introspection.
*/
- protected void writeSerializer() {
+ protected void writeSerializer() throws IOException {
String typeDesc = null;
if (attributes != null || elementMappings != null) {
typeDesc = "typeDesc";
@@ -233,7 +232,7 @@
* write Deserializer getter code and pass in meta data to avoid
* undo introspection.
*/
- protected void writeDeserializer() {
+ protected void writeDeserializer() throws IOException {
String typeDesc = null;
if (attributes != null || elementMappings != null) {
typeDesc = "typeDesc";
1.4 +5 -5
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
Index: JavaDefinitionWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaDefinitionWriter.java 5 Mar 2002 14:52:06 -0000 1.3
+++ JavaDefinitionWriter.java 29 Mar 2002 22:13:05 -0000 1.4
@@ -76,11 +76,11 @@
* deploy.xml, undeploy.xml and Faults as needed.
*/
public class JavaDefinitionWriter implements Writer {
- Writer deployWriter = null;
- Writer undeployWriter = null;
- Emitter emitter;
- Definition definition;
- SymbolTable symbolTable;
+ protected Writer deployWriter = null;
+ protected Writer undeployWriter = null;
+ protected Emitter emitter;
+ protected Definition definition;
+ protected SymbolTable symbolTable;
/**
* Constructor.
1.21 +2 -2
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriterFactory.java
Index: JavaWriterFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriterFactory.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JavaWriterFactory.java 19 Mar 2002 20:15:28 -0000 1.20
+++ JavaWriterFactory.java 29 Mar 2002 22:13:05 -0000 1.21
@@ -78,8 +78,8 @@
*/
public class JavaWriterFactory implements WriterFactory {
- private Emitter emitter;
- private SymbolTable symbolTable;
+ protected Emitter emitter;
+ protected SymbolTable symbolTable;
/**
* Default constructor. Note that this class is unusable until setEmitter
