Hi,
my name is Elmar Fasel, I'm a computer science student, developing
software in Java for some time now and interested in taking part in the
development of axis.
I want to know if there are some common rules how to submit patches to
the project.
The patches I'm sending here (see attachment) correct the access to
static fields and remove some unused import statements, so it's a rather
cosmetic patch.
If I get a grip on the framework I would try to improve the wsdl2java
process, so that it generates correct javadoc comments.
Best regards,
Elmar
--
Elmar Fasel <[EMAIL PROTECTED]>
Index: org/apache/axis/client/Call.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.202
diff -u -r1.202 Call.java
--- org/apache/axis/client/Call.java 12 Feb 2003 21:59:28 -0000 1.202
+++ org/apache/axis/client/Call.java 16 Feb 2003 01:52:38 -0000
@@ -62,6 +62,7 @@
import org.apache.axis.InternalException;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
+import org.apache.axis.attachments.Attachments;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.description.FaultDesc;
import org.apache.axis.description.OperationDesc;
@@ -1715,7 +1716,7 @@
invoke();
msg = msgContext.getResponseMessage();
if (msg == null) {
- if (this.FAULT_ON_NO_RESPONSE) {
+ if (Call.FAULT_ON_NO_RESPONSE) {
throw new AxisFault(Messages.getMessage("nullResponse00"));
} else {
return null;
@@ -1945,10 +1946,10 @@
if(null != attachments) {
if( null != attachformat && attachformat.equals(
ATTACHMENT_ENCAPSULATION_FORMAT_MIME))
- attachments.setSendType(attachments.SEND_TYPE_MIME);
+ attachments.setSendType(Attachments.SEND_TYPE_MIME);
else if( null != attachformat && attachformat.equals(
ATTACHMENT_ENCAPSULATION_FORMAT_DIME)) {
- attachments.setSendType(attachments.SEND_TYPE_DIME);
+ attachments.setSendType(Attachments.SEND_TYPE_DIME);
}
}
}
@@ -2531,7 +2532,7 @@
Message resMsg = msgContext.getResponseMessage();
if (resMsg == null) {
- if (this.FAULT_ON_NO_RESPONSE) {
+ if (Call.FAULT_ON_NO_RESPONSE) {
throw new AxisFault(Messages.getMessage("nullResponse00"));
} else {
return;
Index: org/apache/axis/components/jms/BeanVendorAdapter.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/components/jms/BeanVendorAdapter.java,v
retrieving revision 1.2
diff -u -r1.2 BeanVendorAdapter.java
--- org/apache/axis/components/jms/BeanVendorAdapter.java 11 Dec 2002 22:38:10 -0000 1.2
+++ org/apache/axis/components/jms/BeanVendorAdapter.java 16 Feb 2003 01:52:39 -0000
@@ -60,12 +60,8 @@
import org.apache.axis.utils.ClassUtils;
import javax.jms.ConnectionFactory;
-import javax.jms.Queue;
import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSession;
-import javax.jms.Topic;
import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSession;
import java.util.HashMap;
/**
Index: org/apache/axis/components/jms/JMSVendorAdapter.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/components/jms/JMSVendorAdapter.java,v
retrieving revision 1.3
diff -u -r1.3 JMSVendorAdapter.java
--- org/apache/axis/components/jms/JMSVendorAdapter.java 11 Dec 2002 22:38:10 -0000 1.3
+++ org/apache/axis/components/jms/JMSVendorAdapter.java 16 Feb 2003 01:52:39 -0000
@@ -56,7 +56,6 @@
package org.apache.axis.components.jms;
import javax.jms.InvalidDestinationException;
-import javax.jms.JMSException;
import javax.jms.JMSSecurityException;
import javax.jms.Queue;
import javax.jms.QueueConnectionFactory;
Index: org/apache/axis/encoding/TypeMappingRegistryImpl.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistryImpl.java,v
retrieving revision 1.21
diff -u -r1.21 TypeMappingRegistryImpl.java
--- org/apache/axis/encoding/TypeMappingRegistryImpl.java 11 Dec 2002 22:38:14 -0000 1.21
+++ org/apache/axis/encoding/TypeMappingRegistryImpl.java 16 Feb 2003 01:52:41 -0000
@@ -58,7 +58,6 @@
import org.apache.axis.Constants;
import org.apache.axis.utils.Messages;
-import javax.xml.rpc.JAXRPCException;
import java.util.HashMap;
/**
Index: org/apache/axis/encoding/ser/BaseDeserializerFactory.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/encoding/ser/BaseDeserializerFactory.java,v
retrieving revision 1.10
diff -u -r1.10 BaseDeserializerFactory.java
--- org/apache/axis/encoding/ser/BaseDeserializerFactory.java 26 Sep 2002 00:24:50 -0000 1.10
+++ org/apache/axis/encoding/ser/BaseDeserializerFactory.java 16 Feb 2003 01:52:41 -0000
@@ -90,8 +90,8 @@
*/
public BaseDeserializerFactory(Class deserClass) {
this.deserClass = deserClass;
- this.mechanisms = new Vector();
- this.mechanisms.add(Constants.AXIS_SAX);
+ BaseDeserializerFactory.mechanisms = new Vector();
+ BaseDeserializerFactory.mechanisms.add(Constants.AXIS_SAX);
}
public BaseDeserializerFactory(Class deserClass,
QName xmlType,
Index: org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java,v
retrieving revision 1.24
diff -u -r1.24 JAFDataHandlerSerializer.java
--- org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java 30 Dec 2002 19:40:54 -0000 1.24
+++ org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java 16 Feb 2003 01:52:42 -0000
@@ -57,7 +57,6 @@
import org.apache.axis.Constants;
import org.apache.axis.Part;
-import org.apache.axis.client.Call;
import org.apache.axis.attachments.Attachments;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.encoding.SerializationContext;
Index: org/apache/axis/handlers/soap/SOAPService.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
retrieving revision 1.92
diff -u -r1.92 SOAPService.java
--- org/apache/axis/handlers/soap/SOAPService.java 25 Jan 2003 19:35:33 -0000 1.92
+++ org/apache/axis/handlers/soap/SOAPService.java 16 Feb 2003 01:52:43 -0000
@@ -170,8 +170,8 @@
public void invoke(MessageContext msgContext) throws AxisFault {
// Do SOAP semantics here
- if (this.log.isDebugEnabled()) {
- this.log.debug( Messages.getMessage("semanticCheck00"));
+ if (SOAPResponseHandler.log.isDebugEnabled()) {
+ SOAPResponseHandler.log.debug( Messages.getMessage("semanticCheck00"));
}
ArrayList acts = getActors();
Index: org/apache/axis/providers/java/EJBProvider.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/providers/java/EJBProvider.java,v
retrieving revision 1.38
diff -u -r1.38 EJBProvider.java
--- org/apache/axis/providers/java/EJBProvider.java 6 Feb 2003 04:20:27 -0000 1.38
+++ org/apache/axis/providers/java/EJBProvider.java 16 Feb 2003 01:52:45 -0000
@@ -60,7 +60,6 @@
import org.apache.axis.Handler;
import org.apache.axis.MessageContext;
import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.description.ServiceDesc;
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.utils.ClassUtils;
import org.apache.axis.utils.Messages;
@@ -69,7 +68,6 @@
import javax.naming.Context;
import javax.naming.InitialContext;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Properties;
/**
Index: org/apache/axis/transport/http/SimpleAxisWorker.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisWorker.java,v
retrieving revision 1.21
diff -u -r1.21 SimpleAxisWorker.java
--- org/apache/axis/transport/http/SimpleAxisWorker.java 11 Dec 2002 22:38:23 -0000 1.21
+++ org/apache/axis/transport/http/SimpleAxisWorker.java 16 Feb 2003 01:52:47 -0000
@@ -185,7 +185,7 @@
public void run() {
byte buf[] = new byte[BUFSIZ];
// create an Axis server
- AxisServer engine = server.getAxisServer();
+ AxisServer engine = SimpleAxisServer.getAxisServer();
// create and initialize a message context
MessageContext msgContext = new MessageContext(engine);
@@ -394,7 +394,7 @@
// fake one up!
// make it be an arbitrarily increasing number
// (no this is not thread safe because ++ isn't atomic)
- int i = server.sessionIndex++;
+ int i = SimpleAxisServer.sessionIndex++;
cooky = "" + i;
}
@@ -478,7 +478,7 @@
} catch (Exception e) {
}
}
- if (msgContext.getProperty(msgContext.QUIT_REQUESTED) != null) {
+ if (msgContext.getProperty(MessageContext.QUIT_REQUESTED) != null) {
// why then, quit!
try {
server.stop();
Index: org/apache/axis/transport/java/JavaSender.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/java/JavaSender.java,v
retrieving revision 1.3
diff -u -r1.3 JavaSender.java
--- org/apache/axis/transport/java/JavaSender.java 11 Dec 2002 22:38:23 -0000 1.3
+++ org/apache/axis/transport/java/JavaSender.java 16 Feb 2003 01:52:48 -0000
@@ -87,7 +87,7 @@
msgContext.setService( null );
msgContext.setOperation( null );
- if ( msgContext.getProperty(msgContext.IS_MSG) == null )
+ if ( msgContext.getProperty(MessageContext.IS_MSG) == null )
service = new SOAPService(new RPCProvider());
else
service = new SOAPService(new MsgProvider());
Index: org/apache/axis/transport/jms/JMSConnector.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/jms/JMSConnector.java,v
retrieving revision 1.4
diff -u -r1.4 JMSConnector.java
--- org/apache/axis/transport/jms/JMSConnector.java 11 Dec 2002 22:38:24 -0000 1.4
+++ org/apache/axis/transport/jms/JMSConnector.java 16 Feb 2003 01:52:50 -0000
@@ -64,7 +64,6 @@
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.Session;
import java.io.ByteArrayOutputStream;
Index: org/apache/axis/transport/jms/JMSEndpoint.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/jms/JMSEndpoint.java,v
retrieving revision 1.3
diff -u -r1.3 JMSEndpoint.java
--- org/apache/axis/transport/jms/JMSEndpoint.java 11 Dec 2002 22:38:24 -0000 1.3
+++ org/apache/axis/transport/jms/JMSEndpoint.java 16 Feb 2003 01:52:50 -0000
@@ -56,7 +56,6 @@
package org.apache.axis.transport.jms;
import javax.jms.Destination;
-import javax.jms.JMSException;
import javax.jms.MessageListener;
import javax.jms.Session;
import java.util.HashMap;
Index: org/apache/axis/transport/jms/JMSSender.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/jms/JMSSender.java,v
retrieving revision 1.2
diff -u -r1.2 JMSSender.java
--- org/apache/axis/transport/jms/JMSSender.java 11 Dec 2002 22:38:24 -0000 1.2
+++ org/apache/axis/transport/jms/JMSSender.java 16 Feb 2003 01:52:51 -0000
@@ -60,7 +60,6 @@
import org.apache.axis.MessageContext;
import org.apache.axis.handlers.BasicHandler;
-import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import java.io.ByteArrayOutputStream;
import java.util.HashMap;
Index: org/apache/axis/transport/jms/QueueConnector.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/jms/QueueConnector.java,v
retrieving revision 1.3
diff -u -r1.3 QueueConnector.java
--- org/apache/axis/transport/jms/QueueConnector.java 11 Dec 2002 22:38:24 -0000 1.3
+++ org/apache/axis/transport/jms/QueueConnector.java 16 Feb 2003 01:52:52 -0000
@@ -63,8 +63,6 @@
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
Index: org/apache/axis/transport/jms/SimpleJMSListener.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/jms/SimpleJMSListener.java,v
retrieving revision 1.5
diff -u -r1.5 SimpleJMSListener.java
--- org/apache/axis/transport/jms/SimpleJMSListener.java 11 Dec 2002 22:38:24 -0000 1.5
+++ org/apache/axis/transport/jms/SimpleJMSListener.java 16 Feb 2003 01:52:52 -0000
@@ -62,8 +62,6 @@
import org.apache.commons.logging.Log;
import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.JMSException;
import javax.jms.MessageListener;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
@@ -102,7 +100,7 @@
String password, boolean doThreads)
throws Exception
{
- this.doThreads = doThreads;
+ SimpleJMSListener.doThreads = doThreads;
try {
connector = JMSConnectorFactory.
Index: org/apache/axis/transport/jms/SimpleJMSWorker.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/jms/SimpleJMSWorker.java,v
retrieving revision 1.4
diff -u -r1.4 SimpleJMSWorker.java
--- org/apache/axis/transport/jms/SimpleJMSWorker.java 11 Dec 2002 22:38:25 -0000 1.4
+++ org/apache/axis/transport/jms/SimpleJMSWorker.java 16 Feb 2003 01:52:53 -0000
@@ -118,7 +118,7 @@
}
// create the msg and context and invoke the server
- AxisServer server = listener.getAxisServer();
+ AxisServer server = SimpleJMSListener.getAxisServer();
Message msg = new Message(in);
MessageContext msgContext = new MessageContext(server);
msgContext.setRequestMessage( msg );
@@ -154,7 +154,7 @@
e.printStackTrace();
}
- if (msgContext.getProperty(msgContext.QUIT_REQUESTED) != null)
+ if (msgContext.getProperty(MessageContext.QUIT_REQUESTED) != null)
// why then, quit!
try {listener.shutdown();} catch (Exception e) {}
}
Index: org/apache/axis/transport/jms/TopicConnector.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/jms/TopicConnector.java,v
retrieving revision 1.3
diff -u -r1.3 TopicConnector.java
--- org/apache/axis/transport/jms/TopicConnector.java 11 Dec 2002 22:38:25 -0000 1.3
+++ org/apache/axis/transport/jms/TopicConnector.java 16 Feb 2003 01:52:54 -0000
@@ -60,15 +60,12 @@
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
-import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TemporaryTopic;
-import javax.jms.TextMessage;
import javax.jms.Topic;
import javax.jms.TopicConnection;
import javax.jms.TopicConnectionFactory;
Index: org/apache/axis/transport/mail/MailWorker.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/transport/mail/MailWorker.java,v
retrieving revision 1.1
diff -u -r1.1 MailWorker.java
--- org/apache/axis/transport/mail/MailWorker.java 13 Dec 2002 20:46:08 -0000 1.1
+++ org/apache/axis/transport/mail/MailWorker.java 16 Feb 2003 01:52:54 -0000
@@ -109,7 +109,7 @@
*/
public void run() {
// create an Axis server
- AxisServer engine = server.getAxisServer();
+ AxisServer engine = MailServer.getAxisServer();
// create and initialize a message context
MessageContext msgContext = new MessageContext(engine);
@@ -204,7 +204,7 @@
e.printStackTrace();
log.debug(Messages.getMessage("exception00"), e);
}
- if (msgContext.getProperty(msgContext.QUIT_REQUESTED) != null) {
+ if (msgContext.getProperty(MessageContext.QUIT_REQUESTED) != null) {
// why then, quit!
try {
server.stop();
Index: org/apache/axis/utils/Admin.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
retrieving revision 1.129
diff -u -r1.129 Admin.java
--- org/apache/axis/utils/Admin.java 18 Dec 2002 00:39:55 -0000 1.129
+++ org/apache/axis/utils/Admin.java 16 Feb 2003 01:52:55 -0000
@@ -130,7 +130,7 @@
if (msgContext != null) {
// put a flag into message context so listener will exit after
// sending response
- msgContext.setProperty(msgContext.QUIT_REQUESTED, "true");
+ msgContext.setProperty(MessageContext.QUIT_REQUESTED, "true");
}
doc = XMLUtils.newDocument();
doc.appendChild( root = doc.createElementNS("", "Admin" ) );
Index: org/apache/axis/wsdl/toJava/Emitter.java
===================================================================
RCS file: /home/cvspublic/xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
retrieving revision 1.57
diff -u -r1.57 Emitter.java
--- org/apache/axis/wsdl/toJava/Emitter.java 25 Jan 2003 21:57:47 -0000 1.57
+++ org/apache/axis/wsdl/toJava/Emitter.java 16 Feb 2003 01:52:57 -0000
@@ -70,7 +70,6 @@
import javax.wsdl.WSDLException;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.lang.reflect.Constructor;
