rsitze 02/05/17 12:09:35
Modified: java/src/org/apache/axis/wsdl/toJava
JavaGeneratorFactory.java JavaImplWriter.java
JavaBeanHelperWriter.java JavaUndeployWriter.java
JavaSkelWriter.java JavaServiceImplWriter.java
JavaEnumTypeWriter.java JavaStubWriter.java
java/src/org/apache/axis/wsdl/symbolTable SymbolTable.java
SchemaUtils.java Utils.java
java/src/org/apache/axis FaultableHandler.java Message.java
java/src/org/apache/axis/client Service.java
java/src/org/apache/axis/message SAX2EventRecorder.java
java/src/org/apache/axis/utils tcpmon.java CLArgsParser.java
JWSClassLoader.java
java/src/org/apache/axis/transport/http
SimpleAxisServer.java
java/src/org/apache/axis/deployment/wsdd WSDDProvider.java
java/src/org/apache/axis/encoding/ser BeanDeserializer.java
SimpleDeserializer.java
Log:
Remove unused local vars
Revision Changes Path
1.6 +2 -4
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
Index: JavaGeneratorFactory.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaGeneratorFactory.java 16 May 2002 19:34:17 -0000 1.5
+++ JavaGeneratorFactory.java 17 May 2002 19:09:32 -0000 1.6
@@ -426,9 +426,7 @@
// Inspect the Operations of the PortType
while(operations.hasNext()) {
Operation operation = (Operation) operations.next();
- OperationType type = operation.getStyle();
// Get the associated parameters of the operation.
- String name = operation.getName();
Parameters parameters = bEntry.getParameters(operation);
// Inspect the faults of the operation
@@ -890,8 +888,8 @@
// If entry is a BindingEntry, look at all the Parameters
// in its portType
BindingEntry bEntry = (BindingEntry) v.get(i);
- PortTypeEntry ptEntry =
-
symbolTable.getPortTypeEntry(bEntry.getBinding().getPortType().getQName());
+// PortTypeEntry ptEntry =
+//
symbolTable.getPortTypeEntry(bEntry.getBinding().getPortType().getQName());
Iterator operations =
bEntry.getParameters().values().iterator();
while (operations.hasNext()) {
1.21 +0 -2
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaImplWriter.java
Index: JavaImplWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaImplWriter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JavaImplWriter.java 16 May 2002 19:34:17 -0000 1.20
+++ JavaImplWriter.java 17 May 2002 19:09:32 -0000 1.21
@@ -116,8 +116,6 @@
* Write the body of the binding's stub file.
*/
protected void writeFileBody() throws IOException {
- PortType portType = binding.getPortType();
- PortTypeEntry ptEntry = symbolTable.getPortTypeEntry(portType.getQName());
pw.print("public class " + className + getExtendsText() +
getImplementsText());
pw.println(" {");
1.8 +0 -1
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JavaBeanHelperWriter.java 9 May 2002 13:14:28 -0000 1.7
+++ JavaBeanHelperWriter.java 17 May 2002 19:09:32 -0000 1.8
@@ -132,7 +132,6 @@
if (elements != null) {
for (int i = 0; i < elements.size(); i++) {
ElementDecl elem = (ElementDecl)elements.get(i);
- TypeEntry type = elem.getType();
String elemName = elem.getName().getLocalPart();
String javaName = Utils.xmlNameToJava(elemName);
1.6 +0 -2
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java
Index: JavaUndeployWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaUndeployWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaUndeployWriter.java 10 May 2002 13:30:35 -0000 1.5
+++ JavaUndeployWriter.java 17 May 2002 19:09:33 -0000 1.6
@@ -137,8 +137,6 @@
* Write out deployment and undeployment instructions for given WSDL port
*/
private void writeDeployPort(Port port) throws IOException {
- Binding binding = port.getBinding();
- BindingEntry bEntry = symbolTable.getBindingEntry(binding.getQName());
String serviceName = port.getName();
pw.println(" <service name=\"" + serviceName + "\"/>");
1.26 +3 -3
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
Index: JavaSkelWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JavaSkelWriter.java 16 May 2002 19:34:17 -0000 1.25
+++ JavaSkelWriter.java 17 May 2002 19:09:33 -0000 1.26
@@ -107,9 +107,9 @@
* Write the body of the binding's stub file.
*/
protected void writeFileBody() throws IOException {
- PortType portType = binding.getPortType();
- PortTypeEntry ptEntry =
- symbolTable.getPortTypeEntry(portType.getQName());
+// PortType portType = binding.getPortType();
+// PortTypeEntry ptEntry =
+// symbolTable.getPortTypeEntry(portType.getQName());
String portTypeName = (String)
bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
boolean isRPC = true;
1.13 +2 -1
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
Index: JavaServiceImplWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaServiceImplWriter.java 16 May 2002 19:34:17 -0000 1.12
+++ JavaServiceImplWriter.java 17 May 2002 19:09:33 -0000 1.13
@@ -176,7 +176,8 @@
portName, className));
}
try {
- URL ep = new URL(address);
+// URL ep = new URL(address);
+ new URL(address);
}
catch (MalformedURLException e) {
throw new IOException(JavaUtils.getMessage("emitFail03",
1.7 +0 -2
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java
Index: JavaEnumTypeWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JavaEnumTypeWriter.java 9 May 2002 13:14:28 -0000 1.6
+++ JavaEnumTypeWriter.java 17 May 2002 19:09:33 -0000 1.7
@@ -89,8 +89,6 @@
* the values (subsequent Strings)
*/
protected void writeFileBody() throws IOException {
- Node node = type.getNode();
-
// Get the java name of the type
String javaName = Utils.getJavaLocalName(type.getName());
1.60 +0 -2
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
Index: JavaStubWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- JavaStubWriter.java 16 May 2002 19:34:17 -0000 1.59
+++ JavaStubWriter.java 17 May 2002 19:09:33 -0000 1.60
@@ -120,8 +120,6 @@
*/
protected void writeFileBody() throws IOException {
PortType portType = binding.getPortType();
- PortTypeEntry ptEntry =
- symbolTable.getPortTypeEntry(portType.getQName());
String portTypeName =
(String) bEntry.getDynamicVar(JavaBindingWriter.INTERFACE_NAME);
1.5 +0 -1
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SymbolTable.java 14 May 2002 15:17:19 -0000 1.4
+++ SymbolTable.java 17 May 2002 19:09:33 -0000 1.5
@@ -1149,7 +1149,6 @@
// See if we can map all the XML types to java(?) types
// if we can, we use these as the types
Node node = null;
- Element e;
if (typeName != null) {
// Since we can't (yet?) make the Axis engine generate the right
// XML for literal parts that specify the type attribute,
1.2 +0 -2
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
Index: SchemaUtils.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaUtils.java 9 May 2002 13:14:27 -0000 1.1
+++ SchemaUtils.java 17 May 2002 19:09:33 -0000 1.2
@@ -455,7 +455,6 @@
NodeList children = node.getChildNodes();
Node complexContent = null;
Node simpleContent = null;
- Node extension = null;
for (int j = 0; j < children.getLength() && complexContent == null;
j++) {
QName complexContentKind = Utils.getNodeQName(children.item(j));
if (complexContentKind != null &&
@@ -661,7 +660,6 @@
// Under the complexType there could be a complexContent.
NodeList children = node.getChildNodes();
Node complexContent = null;
- Node extension = null;
if (nodeKind.getLocalPart().equals("complexType")) {
for (int j = 0; j < children.getLength() && complexContent == null;
j++) {
QName complexContentKind = Utils.getNodeQName(children.item(j));
1.2 +0 -1 xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/Utils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Utils.java 9 May 2002 13:14:27 -0000 1.1
+++ Utils.java 17 May 2002 19:09:33 -0000 1.2
@@ -578,7 +578,6 @@
* Usage: println("name=\"" + genXMLQNameString(qname, "foo") + "\""
*/
public static String genQNameAttributeString(QName qname, String prefix) {
- String result;
if (qname.getNamespaceURI() == null || qname.getNamespaceURI().equals(""))
return qname.getLocalPart();
1.35 +1 -1 xml-axis/java/src/org/apache/axis/FaultableHandler.java
Index: FaultableHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/FaultableHandler.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- FaultableHandler.java 9 May 2002 18:14:49 -0000 1.34
+++ FaultableHandler.java 17 May 2002 19:09:34 -0000 1.35
@@ -111,7 +111,7 @@
log.info(JavaUtils.getMessage("toAxisFault00"), e );
AxisFault fault = AxisFault.makeFault(e);
- AxisEngine engine = msgContext.getAxisEngine();
+// AxisEngine engine = msgContext.getAxisEngine();
/** Index off fault code.
*
1.66 +8 -6 xml-axis/java/src/org/apache/axis/Message.java
Index: Message.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Message.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Message.java 15 Mar 2002 01:14:09 -0000 1.65
+++ Message.java 17 May 2002 19:09:34 -0000 1.66
@@ -203,8 +203,6 @@
if (checkForAttchmentSupport) {
//aviod testing and possibly failing everytime.
checkForAttchmentSupport = false;
- Class mailapiclass = null;
- Class dataHandlerclass = null;
try {
String attachImpName= AxisEngine.DEFAULT_ATTACHMENT_IMPL;
MessageContext mc= getMessageContext();
@@ -218,12 +216,16 @@
if(null == attachImpName){
attachImpName=AxisEngine.DEFAULT_ATTACHMENT_IMPL;
}
- dataHandlerclass =
- Class.forName("javax.activation.DataHandler");
- mailapiclass =
- Class.forName("javax.mail.internet.MimeMultipart");
+
+ /**
+ * Attempt to resolve class name, verify that these are present...
+ */
+ Class.forName("javax.activation.DataHandler");
+ Class.forName("javax.mail.internet.MimeMultipart");
+
attachImpl =
Class.forName(attachImpName);
+
attachmentSupportEnabled = true;
} catch (ClassNotFoundException ex) {
// no support for it, leave mAttachments null.
1.52 +0 -2 xml-axis/java/src/org/apache/axis/client/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Service.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Service.java 13 May 2002 14:49:01 -0000 1.51
+++ Service.java 17 May 2002 19:09:34 -0000 1.52
@@ -362,8 +362,6 @@
*/
public javax.xml.rpc.Call createCall(QName portName)
throws ServiceException {
- javax.wsdl.QName qn = new javax.wsdl.QName( portName.getNamespaceURI(),
- portName.getLocalPart() );
if ( wsdlDefinition == null )
throw new ServiceException( JavaUtils.getMessage("wsdlMissing00") );
1.6 +1 -1 xml-axis/java/src/org/apache/axis/message/SAX2EventRecorder.java
Index: SAX2EventRecorder.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/message/SAX2EventRecorder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SAX2EventRecorder.java 9 Apr 2002 23:44:08 -0000 1.5
+++ SAX2EventRecorder.java 17 May 2002 19:09:34 -0000 1.6
@@ -194,7 +194,7 @@
handler.endPrefixMapping(st.getSymbol(events.get(n, 1)));
break;
case STATE_START_ELEMENT:
- int attrIdx = events.get(n,4);
+// int attrIdx = events.get(n,4);
handler.startElement(st.getSymbol(events.get(n,1)),
st.getSymbol(events.get(n,2)),
1.30 +0 -1 xml-axis/java/src/org/apache/axis/utils/tcpmon.java
Index: tcpmon.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/tcpmon.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tcpmon.java 26 Mar 2002 12:26:31 -0000 1.29
+++ tcpmon.java 17 May 2002 19:09:34 -0000 1.30
@@ -680,7 +680,6 @@
if ( listener.isProxyBox.isSelected() || HTTPProxyHost != null ) {
// Check if we're a proxy
- int ch ;
byte[] b = new byte[1];
buf = new StringBuffer();
String s ;
1.3 +1 -1 xml-axis/java/src/org/apache/axis/utils/CLArgsParser.java
Index: CLArgsParser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/CLArgsParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CLArgsParser.java 13 May 2002 13:11:34 -0000 1.2
+++ CLArgsParser.java 17 May 2002 19:09:34 -0000 1.3
@@ -270,7 +270,7 @@
final CLOption option = (CLOption)arguments.elementAt( i );
final int id = option.getId();
- final CLOptionDescriptor descriptor = getDescriptorFor( id );
+// final CLOptionDescriptor descriptor = getDescriptorFor( id );
for( int j = 0; j < incompatible.length; j++ )
{
1.3 +2 -1 xml-axis/java/src/org/apache/axis/utils/JWSClassLoader.java
Index: JWSClassLoader.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JWSClassLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JWSClassLoader.java 18 Feb 2002 23:44:17 -0000 1.2
+++ JWSClassLoader.java 17 May 2002 19:09:34 -0000 1.3
@@ -105,7 +105,8 @@
/* Create a new Class object from it */
/*************************************/
byte[] data = baos.toByteArray();
- Class cls = defineClass( name, data, 0, data.length );
+// Class cls =
+ defineClass( name, data, 0, data.length );
classloaders.put(name, this);
}
1.57 +1 -2
xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java
Index: SimpleAxisServer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- SimpleAxisServer.java 1 May 2002 18:40:47 -0000 1.56
+++ SimpleAxisServer.java 17 May 2002 19:09:35 -0000 1.57
@@ -432,7 +432,7 @@
}
}
- byte[] response = (byte[]) responseMsg.getSOAPPart().getAsBytes();
+// byte[] response = (byte[]) responseMsg.getSOAPPart().getAsBytes();
// Send it on its way...
OutputStream out = socket.getOutputStream();
@@ -626,7 +626,6 @@
throw new IOException(JavaUtils.getMessage("badRequest00"));
}
- StringBuffer lastbuf=null;
while ((n=readLine(is,buf,0,buf.length)) > 0) {
if ((n<=2) && (buf[0]=='\n'||buf[0]=='\r') && (len>0)) break;
1.17 +0 -2
xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDProvider.java
Index: WSDDProvider.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDProvider.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WSDDProvider.java 28 Jan 2002 18:23:00 -0000 1.16
+++ WSDDProvider.java 17 May 2002 19:09:35 -0000 1.17
@@ -124,8 +124,6 @@
*/
public WSDDOperation getOperation(String name)
{
- WSDDOperation[] t = getOperations();
-
return null;
}
1.25 +1 -1
xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
Index: BeanDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- BeanDeserializer.java 10 May 2002 15:24:31 -0000 1.24
+++ BeanDeserializer.java 17 May 2002 19:09:35 -0000 1.25
@@ -332,7 +332,7 @@
if (fieldName == null)
continue;
- String attrName = attributes.getLocalName(i);
+// String attrName = attributes.getLocalName(i);
// look for the attribute property
BeanPropertyDescriptor bpd =
1.13 +0 -2
xml-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java
Index: SimpleDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SimpleDeserializer.java 20 Apr 2002 00:22:24 -0000 1.12
+++ SimpleDeserializer.java 17 May 2002 19:09:35 -0000 1.13
@@ -274,8 +274,6 @@
if (fieldName == null)
continue;
- String attrName = attributes.getLocalName(i);
-
// look for the attribute property
BeanPropertyDescriptor bpd =
(BeanPropertyDescriptor) propertyMap.get(fieldName);
